Import prebuilt android support libs build 1585793 21.0.2

http://android-build/builds/git_lmp-sdk-release-linux-sdk_phone_x86-sdk/1585793/sdk-repo-linux-support-1585793.zip

23 files changed, 48 insertions, 33 deletions

diff --git a/support/appcompat/libs/android-support-v4.jar b/support/appcompat/libs/android-support-v4.jar
index be869f4b..af944938 100644
--- a/support/appcompat/libs/android-support-v4.jar
+++ b/support/appcompat/libs/android-support-v4.jar
diff --git a/support/appcompat/libs/android-support-v7-appcompat.jar b/support/appcompat/libs/android-support-v7-appcompat.jar
index 13f88d12..84d1c6f6 100644
--- a/support/appcompat/libs/android-support-v7-appcompat.jar
+++ b/support/appcompat/libs/android-support-v7-appcompat.jar
diff --git a/support/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml b/support/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml
index 5a296869..7407498a 100644
--- a/support/appcompat/res/layout/abc_search_dropdown_item_icons_2line.xml
+++ b/support/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/support/appcompat/res/values-v11/styles_base_text.xml b/support/appcompat/res/values-v11/styles_base_text.xml
index d7118c0d..4cf49666 100644
--- a/support/appcompat/res/values-v11/styles_base_text.xml
+++ b/support/appcompat/res/values-v11/styles_base_text.xml
@@ -17,6 +17,20 @@
 
 <resources>
 
+    <style name="Base.TextAppearance.AppCompat.Title.Inverse">
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
+    </style>
+
+    <style name="Base.TextAppearance.AppCompat.Subhead.Inverse">
+        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
+        <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
+        <item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
+        <item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
+    </style>
+
     <!-- Deprecated text styles -->
 
     <style name="Base.TextAppearance.AppCompat.Inverse">
diff --git a/support/appcompat/res/values/attrs.xml b/support/appcompat/res/values/attrs.xml
index 896a80a4..e2dbdea8 100644
--- a/support/appcompat/res/values/attrs.xml
+++ b/support/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/support/appcompat/res/values/strings.xml b/support/appcompat/res/values/strings.xml
index 765833da..5080070d 100644
--- a/support/appcompat/res/values/strings.xml
+++ b/support/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/support/appcompat/res/values/styles_base.xml b/support/appcompat/res/values/styles_base.xml
index db2cd73a..664581e4 100644
--- a/support/appcompat/res/values/styles_base.xml
+++ b/support/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/support/appcompat/res/values/styles_base_text.xml b/support/appcompat/res/values/styles_base_text.xml
index 92a02bba..78e119c8 100644
--- a/support/appcompat/res/values/styles_base_text.xml
+++ b/support/appcompat/res/values/styles_base_text.xml
@@ -58,8 +58,6 @@
     <style name="Base.TextAppearance.AppCompat.Title.Inverse">
         <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
         <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
-        <item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
-        <item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
     </style>
 
     <style name="Base.TextAppearance.AppCompat.Subhead">
@@ -70,8 +68,6 @@
     <style name="Base.TextAppearance.AppCompat.Subhead.Inverse">
         <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
         <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
-        <item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
-        <item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
     </style>
 
     <style name="Base.TextAppearance.AppCompat.Body2">
diff --git a/support/appcompat/res/values/themes_base.xml b/support/appcompat/res/values/themes_base.xml
index 3c0ee65c..a2f0f25f 100644
--- a/support/appcompat/res/values/themes_base.xml
+++ b/support/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/support/cardview/libs/android-support-v7-cardview.jar b/support/cardview/libs/android-support-v7-cardview.jar
index 3ad0e681..ac98534e 100644
--- a/support/cardview/libs/android-support-v7-cardview.jar
+++ b/support/cardview/libs/android-support-v7-cardview.jar
diff --git a/support/gridlayout/libs/android-support-v7-gridlayout.jar b/support/gridlayout/libs/android-support-v7-gridlayout.jar
index c18c934b..b11786f0 100644
--- a/support/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/support/gridlayout/libs/android-support-v7-gridlayout.jar
diff --git a/support/leanback/libs/android-support-v17-leanback.jar b/support/leanback/libs/android-support-v17-leanback.jar
index b73a8617..7848a1f4 100644
--- a/support/leanback/libs/android-support-v17-leanback.jar
+++ b/support/leanback/libs/android-support-v17-leanback.jar
diff --git a/support/leanback/res/layout/lb_browse_fragment.xml b/support/leanback/res/layout/lb_browse_fragment.xml
index 8ea9a533..bc8ffc36 100644
--- a/support/leanback/res/layout/lb_browse_fragment.xml
+++ b/support/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/support/leanback/res/layout/lb_details_overview.xml b/support/leanback/res/layout/lb_details_overview.xml
index 1e4e0fc7..7b94d5d8 100644
--- a/support/leanback/res/layout/lb_details_overview.xml
+++ b/support/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/support/leanback/res/layout/lb_rows_fragment.xml b/support/leanback/res/layout/lb_rows_fragment.xml
index c4ffdc3a..c188b3cd 100644
--- a/support/leanback/res/layout/lb_rows_fragment.xml
+++ b/support/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/support/leanback/res/layout/lb_vertical_grid_fragment.xml b/support/leanback/res/layout/lb_vertical_grid_fragment.xml
index db43e229..b2879862 100644
--- a/support/leanback/res/layout/lb_vertical_grid_fragment.xml
+++ b/support/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/support/leanback/res/values/colors.xml b/support/leanback/res/values/colors.xml
index 46a5fde6..0987ae6d 100644
--- a/support/leanback/res/values/colors.xml
+++ b/support/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/support/mediarouter/libs/android-support-v7-mediarouter.jar b/support/mediarouter/libs/android-support-v7-mediarouter.jar
index 82439fde..b6fc5d86 100644
--- a/support/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/support/mediarouter/libs/android-support-v7-mediarouter.jar
diff --git a/support/multidex/libs/android-support-multidex.jar b/support/multidex/libs/android-support-multidex.jar
index 43da791e..c8f68ab0 100644
--- a/support/multidex/libs/android-support-multidex.jar
+++ b/support/multidex/libs/android-support-multidex.jar
diff --git a/support/palette/libs/android-support-v7-palette.jar b/support/palette/libs/android-support-v7-palette.jar
index 06e6f3cd..dd9f7e7f 100644
--- a/support/palette/libs/android-support-v7-palette.jar
+++ b/support/palette/libs/android-support-v7-palette.jar
diff --git a/support/recyclerview/libs/android-support-v7-recyclerview.jar b/support/recyclerview/libs/android-support-v7-recyclerview.jar
index 3237512b..2ce495f8 100644
--- a/support/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/support/recyclerview/libs/android-support-v7-recyclerview.jar
diff --git a/support/v13/android-support-v13.jar b/support/v13/android-support-v13.jar
index 3e8c69ef..81edb8cc 100644
--- a/support/v13/android-support-v13.jar
+++ b/support/v13/android-support-v13.jar
diff --git a/support/v4/android-support-v4.jar b/support/v4/android-support-v4.jar
index be869f4b..af944938 100644
--- a/support/v4/android-support-v4.jar
+++ b/support/v4/android-support-v4.jar