Import translations. DO NOT MERGE. update support library to 21.0.2 from lmp-sdk-release, build id 1585793
Change-Id: I69e9518b75e3717648a12e58fc9747b21f2c947b
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 068070f..f335af0 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 3824e33..e54928c 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index 64d126b..c8f68ab 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index 8c4f40e..81edb8c 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 96b22e1..7848a1f 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
index 8ea9a53..bc8ffc3 100644
--- a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
@@ -21,7 +21,7 @@
<!-- BrowseFrameLayout serves as root of transition and manages switch between
left and right-->
- <android.support.v17.leanback.app.BrowseFrameLayout
+ <android.support.v17.leanback.widget.BrowseFrameLayout
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants"
@@ -29,11 +29,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
- <android.support.v17.leanback.app.BrowseRowsFrameLayout
+ <android.support.v17.leanback.widget.BrowseRowsFrameLayout
android:id="@+id/browse_container_dock"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false" />
+ android:layout_height="match_parent" />
<!-- Padding needed for shadow -->
<FrameLayout
@@ -43,5 +42,5 @@
android:clipToPadding="false"
android:paddingEnd="50dp" />
<include layout="@layout/lb_browse_title" />
- </android.support.v17.leanback.app.BrowseFrameLayout>
+ </android.support.v17.leanback.widget.BrowseFrameLayout>
</FrameLayout>
diff --git a/current/support/v17/leanback/res/layout/lb_details_overview.xml b/current/support/v17/leanback/res/layout/lb_details_overview.xml
index 1e4e0fc..7b94d5d 100644
--- a/current/support/v17/leanback/res/layout/lb_details_overview.xml
+++ b/current/support/v17/leanback/res/layout/lb_details_overview.xml
@@ -59,7 +59,7 @@
<android.support.v17.leanback.widget.NonOverlappingFrameLayout
android:id="@+id/details_overview_description"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top"
diff --git a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
index c4ffdc3..c188b3c 100644
--- a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
@@ -14,10 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.v17.leanback.widget.VerticalGridView
+<android.support.v17.leanback.widget.ScaleFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/container_list"
+ android:id="@+id/scale_frame"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="?attr/rowsVerticalGridStyle" />
+ android:layout_height="match_parent">
+ <android.support.v17.leanback.widget.VerticalGridView
+ android:id="@+id/container_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="?attr/rowsVerticalGridStyle" />
+
+</android.support.v17.leanback.widget.ScaleFrameLayout>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
index db43e22..b287986 100644
--- a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <android.support.v17.leanback.app.BrowseFrameLayout
+ <android.support.v17.leanback.widget.BrowseFrameLayout
android:id="@+id/browse_frame"
android:focusable="true"
android:focusableInTouchMode="true"
@@ -34,5 +34,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- </android.support.v17.leanback.app.BrowseFrameLayout>
+ </android.support.v17.leanback.widget.BrowseFrameLayout>
</FrameLayout>
diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml
index 46a5fde..0987ae6 100644
--- a/current/support/v17/leanback/res/values/colors.xml
+++ b/current/support/v17/leanback/res/values/colors.xml
@@ -50,7 +50,7 @@
<color name="lb_basic_card_bg_color">#FF3B3B3B</color>
<color name="lb_basic_card_info_bg_color">#FF3B3B3B</color>
<color name="lb_basic_card_title_text_color">#FFEEEEEE</color>
- <color name="lb_basic_card_content_text_color">#FF888888</color>
+ <color name="lb_basic_card_content_text_color">#99EEEEEE</color>
<color name="lb_default_brand_color">#FF455A64</color>
<color name="lb_default_search_color">#FFFFAA3F</color>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index baf2f77..af94493 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index 563e430..84d1c6f 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml b/current/support/v7/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml
index 5a29686..7407498 100644
--- a/current/support/v7/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml
+++ b/current/support/v7/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml
@@ -24,7 +24,8 @@
<!-- Icons come first in the layout, since their placement doesn't depend on
the placement of the text views. -->
- <ImageView android:id="@android:id/icon1"
+ <android.support.v7.internal.widget.TintImageView
+ android:id="@android:id/icon1"
android:layout_width="@dimen/abc_dropdownitem_icon_width"
android:layout_height="48dip"
android:scaleType="centerInside"
@@ -33,7 +34,8 @@
android:visibility="invisible"
style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1" />
- <ImageView android:id="@+id/edit_query"
+ <android.support.v7.internal.widget.TintImageView
+ android:id="@+id/edit_query"
android:layout_width="48dip"
android:layout_height="48dip"
android:scaleType="centerInside"
@@ -43,7 +45,8 @@
android:visibility="gone"
style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query" />
- <ImageView android:id="@id/android:icon2"
+ <android.support.v7.internal.widget.TintImageView
+ android:id="@id/android:icon2"
android:layout_width="48dip"
android:layout_height="48dip"
android:scaleType="centerInside"
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml
index 896a80a..e2dbdea 100644
--- a/current/support/v7/appcompat/res/values/attrs.xml
+++ b/current/support/v7/appcompat/res/values/attrs.xml
@@ -724,13 +724,10 @@
view with a theme override will inherit the themed context. -->
<attr name="theme" format="reference" />
- <attr name="buttonGravity">
- <!-- Push object to the top of its container, not changing its size. -->
- <flag name="top" value="0x30" />
- <!-- Push object to the bottom of its container, not changing its size. -->
- <flag name="bottom" value="0x50" />
- </attr>
+ <!-- Icon drawable to use for the collapse button. -->
<attr name="collapseIcon" format="reference" />
+ <!-- Text to set as the content description for the collapse button. -->
+ <attr name="collapseContentDescription" format="string" />
<!-- Reference to a theme that should be used to inflate popups
shown by widgets in the toolbar. -->
<attr name="popupTheme" />
diff --git a/current/support/v7/appcompat/res/values/strings.xml b/current/support/v7/appcompat/res/values/strings.xml
index 765833d..5080070 100644
--- a/current/support/v7/appcompat/res/values/strings.xml
+++ b/current/support/v7/appcompat/res/values/strings.xml
@@ -24,6 +24,9 @@
<!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
<string name="abc_action_menu_overflow_description">More options</string>
+ <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+ <string name="abc_toolbar_collapse_description">Collapse</string>
+
<!-- Formatting string for describing the action bar's title/home/up affordance.
This is a single tappable "button" that includes the app icon, the Up indicator
(usually a "<" chevron) and the window title text.
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index db2cd73..664581e 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -36,9 +36,6 @@
<item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item>
<item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item>
- <item name="progressBarStyle">@style/Widget.AppCompat.ProgressBar.Horizontal</item>
- <item name="indeterminateProgressStyle">@style/Widget.AppCompat.ProgressBar</item>
-
<item name="android:gravity">center_vertical</item>
<item name="elevation">8dp</item>
<item name="popupTheme">?attr/actionBarPopupTheme</item>
@@ -312,8 +309,8 @@
<item name="android:minHeight">?attr/actionBarSize</item>
<item name="titleMargins">4dp</item>
<item name="maxButtonHeight">56dp</item>
- <item name="buttonGravity">top</item>
<item name="collapseIcon">?attr/homeAsUpIndicator</item>
+ <item name="collapseContentDescription">@string/abc_toolbar_collapse_description</item>
<item name="contentInsetStart">16dp</item>
</style>
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index 3c0ee65..a2f0f25 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -47,7 +47,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
- <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
+ <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Text styles -->
@@ -138,7 +138,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
- <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
+ <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Text styles -->
@@ -589,7 +589,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
- <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
+ <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Action Bar styles -->
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index 41113dc..ac98534 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 3a09511..b11786f 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index 36a8d72..b6fc5d8 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index dcd8b39..dd9f7e7 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index 85899b5..2ce495f 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
