Update current SDK prebuilt to AAY60 #1761955

Change-Id: If5237927e55ffe933fbe09c812c03da01ef14f1c

10 files changed, 26 insertions, 20 deletions

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 cade8ec..e17ac3c 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
diff --git a/current/support/v17/leanback/res/layout/lb_browse_title.xml b/current/support/v17/leanback/res/layout/lb_browse_title.xml
index e14350a..d3c944b 100644
--- a/current/support/v17/leanback/res/layout/lb_browse_title.xml
+++ b/current/support/v17/leanback/res/layout/lb_browse_title.xml
@@ -18,9 +18,5 @@
     android:id="@+id/browse_title_group"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="?attr/browsePaddingTop"
-    android:paddingEnd="?attr/browsePaddingEnd"
-    android:paddingStart="?attr/browsePaddingStart"
-    android:paddingBottom="?attr/browsePaddingTop"
     style="?attr/browseTitleViewStyle" />
 
diff --git a/current/support/v17/leanback/res/layout/lb_list_row.xml b/current/support/v17/leanback/res/layout/lb_list_row.xml
index 80d7bef..8d673f1 100644
--- a/current/support/v17/leanback/res/layout/lb_list_row.xml
+++ b/current/support/v17/leanback/res/layout/lb_list_row.xml
@@ -17,7 +17,10 @@
 
 <android.support.v17.leanback.widget.HorizontalGridView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:lb="http://schemas.android.com/apk/res-auto"
     android:id="@+id/row_content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    lb:rowHeight="wrap_content"
     style="?attr/rowHorizontalGridStyle" />
diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
index 24b367e..a58840d 100644
--- a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
+++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml
@@ -16,7 +16,7 @@
 -->
 
 <!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child
-     views with no padding of their own. Also to allow for negative marge on description. -->
+     views with no padding of their own. Also to allow for negative margin on description. -->
 
 <android.support.v17.leanback.widget.PlaybackControlsRowView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -30,7 +30,7 @@
     <LinearLayout
         android:id="@+id/controls_card"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/lb_playback_controls_card_height"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/lb_playback_controls_margin_bottom"
         android:clipChildren="false"
         android:clipToPadding="false"
@@ -39,13 +39,14 @@
         <ImageView
             android:id="@+id/image"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="@dimen/lb_playback_controls_card_height"
             android:adjustViewBounds="true"
             android:scaleType="fitStart" />
 
         <LinearLayout
+            android:id="@+id/controls_card_right_panel"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:orientation="vertical" >
@@ -53,21 +54,18 @@
             <FrameLayout
                 android:id="@+id/description_dock"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/lb_playback_description_margin_end"
                 android:layout_marginStart="@dimen/lb_playback_description_margin_start"
                 android:paddingTop="@dimen/lb_playback_description_margin_top"
                 android:clipToPadding="false"
                 android:clipChildren="false"
-                android:layout_weight="1"
                 android:gravity="top" />
 
-            <!-- Space here prevents room only for title and subtitle above -->
-
             <Space
                 android:id="@+id/spacer"
                 android:layout_width="match_parent"
-                android:layout_height="12dp" />
+                android:layout_height="24dp" />
 
             <FrameLayout
                 android:id="@+id/controls_dock"
diff --git a/current/support/v17/leanback/res/layout/lb_row_container.xml b/current/support/v17/leanback/res/layout/lb_row_container.xml
index 69fb0e1..31b0f58 100644
--- a/current/support/v17/leanback/res/layout/lb_row_container.xml
+++ b/current/support/v17/leanback/res/layout/lb_row_container.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingStart="?attr/browsePaddingStart"
+    style="?attr/rowHeaderDockStyle"
     android:clipToPadding="false">
 </android.support.v17.leanback.widget.NonOverlappingLinearLayout>
 </merge>
\ No newline at end of file
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 c188b3c..0a5112d 100644
--- a/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_rows_fragment.xml
@@ -24,6 +24,7 @@
         android:id="@+id/container_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
         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.xml b/current/support/v17/leanback/res/layout/lb_vertical_grid.xml
index 7154e48..504c4c9 100644
--- a/current/support/v17/leanback/res/layout/lb_vertical_grid.xml
+++ b/current/support/v17/leanback/res/layout/lb_vertical_grid.xml
@@ -17,8 +17,11 @@
 
 <android.support.v17.leanback.widget.VerticalGridView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:lb="http://schemas.android.com/apk/res-auto"
     android:id="@+id/browse_grid"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="center"
+    android:clipToPadding="false"
+    lb:columnWidth="wrap_content"
     style="?attr/itemsVerticalGridStyle" />
diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml
index 7038fff..923ba3e 100644
--- a/current/support/v17/leanback/res/values/attrs.xml
+++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -223,6 +223,8 @@
         <attr name="rowHorizontalGridStyle" format="reference" />
         <!-- header style inside a row -->
         <attr name="rowHeaderStyle" format="reference" />
+        <!-- style for the layout that hosting Header inside a row -->
+        <attr name="rowHeaderDockStyle" format="reference" />
 
         <!-- hover card title style -->
         <attr name="rowHoverCardTitleStyle" format="reference" />
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml
index 32f2f77..71c5122 100644
--- a/current/support/v17/leanback/res/values/styles.xml
+++ b/current/support/v17/leanback/res/values/styles.xml
@@ -98,6 +98,10 @@
     </style>
 
     <style name="Widget.Leanback.TitleView" >
+        <item name="android:paddingTop">?attr/browsePaddingTop</item>
+        <item name="android:paddingBottom">?attr/browsePaddingTop</item>
+        <item name="android:paddingStart">?attr/browsePaddingStart</item>
+        <item name="android:paddingEnd">?attr/browsePaddingEnd</item>
     </style>
 
     <style name="Widget.Leanback.Title" />
@@ -127,7 +131,6 @@
 
     <style name="Widget.Leanback.Headers.VerticalGridView" >
         <item name="android:paddingStart">?attr/browsePaddingStart</item>
-        <item name="android:clipToPadding">false</item>
         <item name="focusOutFront">true</item>
         <item name="focusOutEnd">true</item>
         <item name="verticalMargin">@dimen/lb_browse_headers_vertical_margin</item>
@@ -145,7 +148,6 @@
 
     <style name="Widget.Leanback.Rows.VerticalGridView" >
         <item name="android:paddingBottom">?attr/browsePaddingBottom</item>
-        <item name="android:clipToPadding">false</item>
         <item name="focusOutFront">true</item>
         <item name="focusOutEnd">true</item>
         <item name="android:focusable">true</item>
@@ -153,7 +155,6 @@
     </style>
 
     <style name="Widget.Leanback.Row.HorizontalGridView">
-        <item name="android:clipToPadding">false</item>
         <item name="android:focusable">true</item>
         <item name="android:focusableInTouchMode">true</item>
         <item name="android:paddingStart">?attr/browsePaddingStart</item>
@@ -163,11 +164,9 @@
         <item name="horizontalMargin">@dimen/lb_browse_item_horizontal_margin</item>
         <item name="verticalMargin">@dimen/lb_browse_item_vertical_margin</item>
         <item name="focusOutFront">true</item>
-        <item name="rowHeight">wrap_content</item>
     </style>
 
     <style name="Widget.Leanback.GridItems.VerticalGridView">
-        <item name="android:clipToPadding">false</item>
         <item name="android:focusable">true</item>
         <item name="android:focusableInTouchMode">true</item>
         <item name="android:paddingStart">?attr/browsePaddingStart</item>
@@ -177,7 +176,6 @@
         <item name="android:gravity">center_horizontal</item>
         <item name="horizontalMargin">@dimen/lb_browse_item_horizontal_margin</item>
         <item name="verticalMargin">@dimen/lb_browse_item_vertical_margin</item>
-        <item name="columnWidth">wrap_content</item>
         <item name="focusOutFront">true</item>
     </style>
 
@@ -185,6 +183,10 @@
         <item name="android:textAppearance">@style/TextAppearance.Leanback.Row.Header</item>
     </style>
 
+    <style name="Widget.Leanback.Row.HeaderDock">
+        <item name="android:paddingStart">?attr/browsePaddingStart</item>
+    </style>
+
     <style name="TextAppearance.Leanback.Row.HoverCardTitle" parent="TextAppearance.Leanback">
         <item name="android:textSize">@dimen/lb_browse_row_hovercard_title_font_size</item>
     </style>
diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml
index 0503e17..457798b 100644
--- a/current/support/v17/leanback/res/values/themes.xml
+++ b/current/support/v17/leanback/res/values/themes.xml
@@ -53,6 +53,7 @@
         <item name="rowHeaderStyle">@style/Widget.Leanback.Row.Header</item>
         <item name="rowHoverCardTitleStyle">@style/Widget.Leanback.Row.HoverCardTitle</item>
         <item name="rowHoverCardDescriptionStyle">@style/Widget.Leanback.Row.HoverCardDescription</item>
+        <item name="rowHeaderDockStyle">@style/Widget.Leanback.Row.HeaderDock</item>
 
         <item name="searchOrbViewStyle">@style/Widget.Leanback.SearchOrbViewStyle</item>