diff options
author | Qiwen Zhao <zhao@google.com> | 2014-08-21 09:49:06 -0700 |
---|---|---|
committer | Qiwen Zhao <zhao@google.com> | 2014-08-21 09:49:06 -0700 |
commit | bac5ff49b6d7a4d826ed8077760fa5ffbfc3d22c (patch) | |
tree | 2ef4929c77d9434aa9711b1a5d84290a4a7f7625 /current/support | |
parent | 5d99884cd42a6885612ce74a86ce23a34348fae3 (diff) | |
download | prebuilts_sdk-bac5ff49b6d7a4d826ed8077760fa5ffbfc3d22c.zip prebuilts_sdk-bac5ff49b6d7a4d826ed8077760fa5ffbfc3d22c.tar.gz prebuilts_sdk-bac5ff49b6d7a4d826ed8077760fa5ffbfc3d22c.tar.bz2 |
DO NOT MERGER - Update prebuilt SDK to LRW52
Diffstat (limited to 'current/support')
16 files changed, 15 insertions, 2 deletions
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 16cd01c..1e59289 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 52d76b3..a4527e6 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 966b979..4e7d969 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 857c1ad..c2f5b33 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 892bb94..4cd27ac 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/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml index 8cd6916..51132f3 100644 --- a/current/support/v17/leanback/res/values/attrs.xml +++ b/current/support/v17/leanback/res/values/attrs.xml @@ -226,6 +226,13 @@ <attr name="playbackControlsIconHighlightColor" format="reference|color" /> <attr name="playbackControlsActionIcons" format="reference" /> + <!-- Default color for dimmed views. --> + <attr name="overlayDimMaskColor" format="color" /> + <!-- Default level of dimming for active views. --> + <attr name="overlayDimActiveLevel" format="fraction" /> + <!-- Default level of dimming for dimmed views. --> + <attr name="overlayDimDimmedLevel" format="fraction" /> + </declare-styleable> diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml index a5db609..0e86e7f 100644 --- a/current/support/v17/leanback/res/values/colors.xml +++ b/current/support/v17/leanback/res/values/colors.xml @@ -25,7 +25,6 @@ <color name="lb_background_protection">#99000000</color> <color name="lb_view_dim_mask_color">#000000</color> - <item name="lb_view_dimmed_level" type="dimen">60%</item> <color name="lb_details_overview_bg_color">#1B1B1B</color> <color name="lb_details_description_color">#EEEEEE</color> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index e5eee70..e1e8dd5 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -138,6 +138,9 @@ <dimen name="lb_error_under_image_baseline_margin">36dp</dimen> <dimen name="lb_error_under_message_baseline_margin">24dp</dimen> + <item name="lb_view_active_level" type="fraction">0%</item> + <item name="lb_view_dimmed_level" type="fraction">60%</item> + <!-- Search bar --> <dimen name="lb_search_bar_height">60dp</dimen> <dimen name="lb_search_bar_padding_left">56dp</dimen> diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml index 5fa12d7..0f12d74 100644 --- a/current/support/v17/leanback/res/values/themes.xml +++ b/current/support/v17/leanback/res/values/themes.xml @@ -75,6 +75,10 @@ <item name="android:windowEnterTransition">@transition/lb_enter_transition</item> <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item> <item name="android:windowReturnTransition">@transition/lb_return_transition</item> - </style> + + <item name="overlayDimMaskColor">@color/lb_view_dim_mask_color</item> + <item name="overlayDimActiveLevel">@fraction/lb_view_active_level</item> + <item name="overlayDimDimmedLevel">@fraction/lb_view_dimmed_level</item> + </style> </resources> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex c2de154..ba9447a 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 3258961..aea9ad3 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 08acf33..ee3b958 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 4d0821b..c5a6d80 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 36e5de0..e31f29e 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 dce703d..270d600 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 1895e26..a39d23d 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |