am fd1a8f60: am 1d2b8a19: DO NOT MERGE - Update prebuilt SDK to lmp-sdk-release build 1434915

* commit 'fd1a8f6083638813a0e3afe03cac01765cc54974':
  DO NOT MERGE - Update prebuilt SDK to lmp-sdk-release build 1434915

5 files changed, 7 insertions, 6 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 cc0be97..057e9a9 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_fragment.xml b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
index 3009cf4..8ea9a53 100644
--- a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
+++ b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml
@@ -32,7 +32,8 @@
         <android.support.v17.leanback.app.BrowseRowsFrameLayout
             android:id="@+id/browse_container_dock"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:clipChildren="false" />
 
         <!-- Padding needed for shadow -->
         <FrameLayout
diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view.xml b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
index 70cfff5..d5591d1 100644
--- a/current/support/v17/leanback/res/layout/lb_image_card_view.xml
+++ b/current/support/v17/leanback/res/layout/lb_image_card_view.xml
@@ -27,7 +27,7 @@
         android:scaleType="centerCrop"
         android:adjustViewBounds="true"
         android:contentDescription="@null" />
-    <FrameLayout
+    <android.support.v17.leanback.widget.ImageCardViewInfo
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         lb:layout_viewType="info" >
@@ -82,5 +82,5 @@
                 android:visibility="gone"
                 android:contentDescription="@null" />
         </RelativeLayout>
-    </FrameLayout>
+    </android.support.v17.leanback.widget.ImageCardViewInfo>
 </merge>
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 0f5dd5f..46eeef1 100644
--- a/current/support/v17/leanback/res/layout/lb_row_container.xml
+++ b/current/support/v17/leanback/res/layout/lb_row_container.xml
@@ -15,12 +15,12 @@
      limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-<LinearLayout
+<android.support.v17.leanback.widget.RowContainerViewHeaderDock
     android:id="@+id/lb_row_container_header_dock"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingLeft="?attr/browsePaddingLeft"
     android:clipToPadding="false">
-</LinearLayout>
+</android.support.v17.leanback.widget.RowContainerViewHeaderDock>
 </merge>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index 83306ac..a4f8c70 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -36,8 +36,8 @@
     <dimen name="lb_browse_headers_width">270dp</dimen>
     <integer name="lb_browse_headers_transition_delay">150</integer>
     <integer name="lb_browse_headers_transition_duration">250</integer>
-
     <integer name="lb_browse_rows_anim_duration">250</integer>
+    <item name="lb_browse_rows_scale" type="fraction">80%</item>
 
     <!-- Derived from the ux spec of 48dp baseline to baseline -->
     <dimen name="lb_browse_headers_vertical_margin">21dp</dimen>