From 1bbdcd9cb2e3946183ad8afc4d9e8e0321184e0f Mon Sep 17 00:00:00 2001
From: Qiwen Zhao <zhao@google.com>
Date: Sat, 23 Aug 2014 11:02:05 -0700
Subject: DO NOT MERGER - Update prebuilt SDK to LRW54

---
 current/android.jar                                | Bin 25808534 -> 25817965 bytes
 .../annotations/android-support-annotations.jar    | Bin 11941 -> 11941 bytes
 .../android-support-multidex-instrumentation.jar   | Bin 1334 -> 1334 bytes
 .../library/libs/android-support-multidex.jar      | Bin 20596 -> 20596 bytes
 current/support/v13/android-support-v13.jar        | Bin 957308 -> 957342 bytes
 .../leanback/libs/android-support-v17-leanback.jar | Bin 387288 -> 395742 bytes
 .../v17/leanback/res/layout/lb_browse_fragment.xml |   5 ++++-
 .../leanback/res/layout/lb_headers_fragment.xml    |   1 +
 current/support/v17/leanback/res/values/dimens.xml |   5 +++++
 current/support/v4/android-support-v4.jar          | Bin 940008 -> 940042 bytes
 .../libs/android-support-v7-appcompat.jar          | Bin 465664 -> 465746 bytes
 .../v7/appcompat/res/values-v11/themes_base.xml    |  20 +++++++++++++++++---
 .../v7/appcompat/res/values/themes_base.xml        |  15 +++++++++------
 .../cardview/libs/android-support-v7-cardview.jar  | Bin 15080 -> 15080 bytes
 .../libs/android-support-v7-gridlayout.jar         | Bin 42438 -> 42438 bytes
 .../libs/android-support-v7-mediarouter.jar        | Bin 175627 -> 175627 bytes
 .../v7/palette/libs/android-support-v7-palette.jar | Bin 18660 -> 18660 bytes
 .../libs/android-support-v7-recyclerview.jar       | Bin 180476 -> 180476 bytes
 current/uiautomator.jar                            | Bin 10081 -> 10081 bytes
 tools/linux/aapt                                   | Bin 1211969 -> 1213891 bytes
 20 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/current/android.jar b/current/android.jar
index 9e53f64..adb8104 100644
Binary files a/current/android.jar and b/current/android.jar differ
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index 1e59289..52dee1f 100644
Binary files a/current/support/annotations/android-support-annotations.jar and b/current/support/annotations/android-support-annotations.jar differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index a4527e6..ca366f6 100644
Binary files a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar and b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index 4e7d969..a64d398 100644
Binary files a/current/support/multidex/library/libs/android-support-multidex.jar and b/current/support/multidex/library/libs/android-support-multidex.jar differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index c2f5b33..1d0d744 100644
Binary files a/current/support/v13/android-support-v13.jar and b/current/support/v13/android-support-v13.jar differ
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 4cd27ac..6becc8b 100644
Binary files a/current/support/v17/leanback/libs/android-support-v17-leanback.jar and b/current/support/v17/leanback/libs/android-support-v17-leanback.jar differ
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
index ba9447a..5cb298e 100644
Binary files a/current/support/v4/android-support-v4.jar and b/current/support/v4/android-support-v4.jar differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index aea9ad3..d8f56b3 100644
Binary files a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar and b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar differ
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
index ee3b958..2f2494a 100644
Binary files a/current/support/v7/cardview/libs/android-support-v7-cardview.jar and b/current/support/v7/cardview/libs/android-support-v7-cardview.jar differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index c5a6d80..628849b 100644
Binary files a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar and b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index e31f29e..8757699 100644
Binary files a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar and b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar differ
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index 270d600..c4c8ffc 100644
Binary files a/current/support/v7/palette/libs/android-support-v7-palette.jar and b/current/support/v7/palette/libs/android-support-v7-palette.jar differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index a39d23d..5b7b558 100644
Binary files a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar and b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar differ
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index f6c827b..523917f 100644
Binary files a/current/uiautomator.jar and b/current/uiautomator.jar differ
diff --git a/tools/linux/aapt b/tools/linux/aapt
index a88c7ce..ae3dca1 100755
Binary files a/tools/linux/aapt and b/tools/linux/aapt differ
-- 
cgit v1.1