diff options
| author | Sailesh Nepal <sail@google.com> | 2014-09-14 21:07:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-14 21:07:08 +0000 |
| commit | c3c14e38fd680e0231815a99ce7aadea8e5ad013 (patch) | |
| tree | 093badd2708cb525c4ef569b2a603233ae619354 /current/support | |
| parent | de4482e5151bc8953eb9f138c2d1ba32a6c8b6c0 (diff) | |
| parent | fd1a8f6083638813a0e3afe03cac01765cc54974 (diff) | |
| download | prebuilts_sdk-c3c14e38fd680e0231815a99ce7aadea8e5ad013.zip prebuilts_sdk-c3c14e38fd680e0231815a99ce7aadea8e5ad013.tar.gz prebuilts_sdk-c3c14e38fd680e0231815a99ce7aadea8e5ad013.tar.bz2 | |
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
Diffstat (limited to 'current/support')
16 files changed, 7 insertions, 6 deletions
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 7ef721b..ae32ad1 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar Binary files differindex a478d09..fb53e23 100644 --- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar +++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar Binary files differindex 968633e..968999b 100644 --- a/current/support/multidex/library/libs/android-support-multidex.jar +++ b/current/support/multidex/library/libs/android-support-multidex.jar diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar Binary files differindex 98e6323..f7c2624 100644 --- a/current/support/v13/android-support-v13.jar +++ b/current/support/v13/android-support-v13.jar diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar Binary files differindex 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> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex 5146d82..7ce5236 100644 --- a/current/support/v4/android-support-v4.jar +++ b/current/support/v4/android-support-v4.jar diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex 59afa3a..72f23a2 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex a8e2ecc..56e5b08 100644 --- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar +++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar Binary files differindex 7108934..42e805d 100644 --- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar +++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex 4ac3199..065bdc4 100644 --- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex e84738f..c669ab7 100644 --- a/current/support/v7/palette/libs/android-support-v7-palette.jar +++ b/current/support/v7/palette/libs/android-support-v7-palette.jar diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar Binary files differindex 420f7d4..5a0f93a 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |