diff options
author | Qiwen Zhao <zhao@google.com> | 2014-08-23 11:02:05 -0700 |
---|---|---|
committer | Qiwen Zhao <zhao@google.com> | 2014-08-23 11:02:05 -0700 |
commit | 1bbdcd9cb2e3946183ad8afc4d9e8e0321184e0f (patch) | |
tree | a8093a2f0c8ea592f9294af752e2f2c8c678724c | |
parent | 8285ccc15ce1909d8388b34cdd20b692bce2e885 (diff) | |
download | prebuilts_sdk-1bbdcd9cb2e3946183ad8afc4d9e8e0321184e0f.zip prebuilts_sdk-1bbdcd9cb2e3946183ad8afc4d9e8e0321184e0f.tar.gz prebuilts_sdk-1bbdcd9cb2e3946183ad8afc4d9e8e0321184e0f.tar.bz2 |
DO NOT MERGER - Update prebuilt SDK to LRW54
20 files changed, 36 insertions, 10 deletions
diff --git a/current/android.jar b/current/android.jar Binary files differindex 9e53f64..adb8104 100644 --- a/current/android.jar +++ b/current/android.jar diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 1e59289..52dee1f 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 a4527e6..ca366f6 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 4e7d969..a64d398 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 c2f5b33..1d0d744 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 4cd27ac..6becc8b 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 076a2f1..3d31412 100644 --- a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml @@ -33,10 +33,13 @@ android:id="@+id/browse_container_dock" android:layout_width="match_parent" android:layout_height="match_parent" /> + + <!-- Padding needed for shadow --> <FrameLayout android:id="@+id/browse_headers_dock" android:layout_width="wrap_content" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:paddingEnd="50dp" /> <include layout="@layout/lb_browse_title" /> </android.support.v17.leanback.app.BrowseFrameLayout> </FrameLayout> diff --git a/current/support/v17/leanback/res/layout/lb_headers_fragment.xml b/current/support/v17/leanback/res/layout/lb_headers_fragment.xml index dbfbb8d..fbc3261 100644 --- a/current/support/v17/leanback/res/layout/lb_headers_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_headers_fragment.xml @@ -20,4 +20,5 @@ android:id="@+id/browse_headers" android:layout_width="@dimen/lb_browse_headers_width" android:layout_height="match_parent" + android:elevation="@dimen/lb_browse_headers_z" style="?attr/headersVerticalGridStyle"/> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index e1e8dd5..893d397 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -191,6 +191,11 @@ <!-- z based shadow --> <dimen name="lb_material_shadow_normal_z">2dp</dimen> <dimen name="lb_material_shadow_focused_z">8dp</dimen> + <dimen name="lb_search_orb_unfocused_z">@dimen/lb_material_shadow_normal_z</dimen> + <dimen name="lb_search_orb_focused_z">@dimen/lb_material_shadow_focused_z</dimen> + <dimen name="lb_details_overview_z">@dimen/lb_material_shadow_normal_z</dimen> + <dimen name="lb_playback_controls_z">@dimen/lb_material_shadow_normal_z</dimen> + <dimen name="lb_browse_headers_z">@dimen/lb_material_shadow_focused_z</dimen> <dimen name="lb_rounded_rect_corner_radius">2dp</dimen> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex ba9447a..5cb298e 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 aea9ad3..d8f56b3 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/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml index 93b1f92..cac5c60 100644 --- a/current/support/v7/appcompat/res/values-v11/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml @@ -26,6 +26,10 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + <item name="buttonBarStyle">?android:attr/buttonBarStyle</item> + <item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item> + <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> @@ -63,6 +67,10 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + <item name="buttonBarStyle">?android:attr/buttonBarStyle</item> + <item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item> + <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_light</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> @@ -101,6 +109,10 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + <item name="buttonBarStyle">?android:attr/buttonBarStyle</item> + <item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item> + <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> @@ -138,6 +150,10 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + <item name="buttonBarStyle">?android:attr/buttonBarStyle</item> + <item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item> + <item name="selectableItemBackground">?android:attr/selectableItemBackground</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_light</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> @@ -180,10 +196,8 @@ <item name="windowActionBarOverlay">false</item> <item name="isLightTheme">true</item> - <item name="buttonBarStyle">@android:style/ButtonBar</item> - <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> - <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> + <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackgroundBorderless</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> <item name="android:listDivider">@drawable/abc_list_divider_material_light</item> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index 67a1e32..a732cb0 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -25,6 +25,9 @@ <style name="Platform.AppCompat" parent="android:Theme"> <item name="android:windowNoTitle">true</item> + <item name="buttonBarStyle">@android:style/ButtonBar</item> + <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> @@ -61,6 +64,9 @@ <style name="Platform.AppCompat.Light" parent="android:Theme.Light"> <item name="android:windowNoTitle">true</item> + <item name="buttonBarStyle">@android:style/ButtonBar</item> + <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_light</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_dark</item> @@ -98,6 +104,9 @@ <style name="Platform.AppCompat.Dialog" parent="android:Theme.Dialog"> <item name="android:windowNoTitle">true</item> + <item name="buttonBarStyle">@android:style/ButtonBar</item> + <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> + <!-- Window colors --> <item name="android:colorForeground">@color/bright_foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item> @@ -147,8 +156,6 @@ <item name="windowActionBarOverlay">false</item> <item name="isLightTheme">false</item> - <item name="buttonBarStyle">@android:style/ButtonBar</item> - <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> @@ -247,8 +254,6 @@ <item name="windowActionBarOverlay">false</item> <item name="isLightTheme">true</item> - <item name="buttonBarStyle">@android:style/ButtonBar</item> - <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item> @@ -370,8 +375,6 @@ <item name="windowActionBarOverlay">false</item> <item name="isLightTheme">false</item> - <item name="buttonBarStyle">@android:style/ButtonBar</item> - <item name="buttonBarButtonStyle">@android:style/Widget.Button</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item> <item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_dark</item> 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 ee3b958..2f2494a 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 c5a6d80..628849b 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 e31f29e..8757699 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 270d600..c4c8ffc 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 a39d23d..5b7b558 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar diff --git a/current/uiautomator.jar b/current/uiautomator.jar Binary files differindex f6c827b..523917f 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar diff --git a/tools/linux/aapt b/tools/linux/aapt Binary files differindex a88c7ce..ae3dca1 100755 --- a/tools/linux/aapt +++ b/tools/linux/aapt |