am 21a0fb7c: Merge "Moving hotseat and qsb gradients up a level. (Bug 6406475)" into jb-dev

* commit '21a0fb7cf230fccd67fd72f6e3f84a2448d454b7':
  Moving hotseat and qsb gradients up a level. (Bug 6406475)

23 files changed, 2 insertions, 3 deletions

diff --git a/res/drawable-hdpi/hotseat_bg_panel.9.png b/res/drawable-hdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 6724b7a78..000000000
--- a/res/drawable-hdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/search_bg_panel.9.png b/res/drawable-hdpi/search_bg_panel.9.png
deleted file mode 100644
index f2a63f9ad..000000000
--- a/res/drawable-hdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/workspace_bg.9.png b/res/drawable-hdpi/workspace_bg.9.png
new file mode 100644
index 000000000..eeed8e720
--- /dev/null
+++ b/res/drawable-hdpi/workspace_bg.9.png
diff --git a/res/drawable-land-hdpi/hotseat_bg_panel.9.png b/res/drawable-land-hdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 90177f850..000000000
--- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-hdpi/search_bg_panel.9.png b/res/drawable-land-hdpi/search_bg_panel.9.png
deleted file mode 100644
index 78f80c9f0..000000000
--- a/res/drawable-land-hdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-hdpi/workspace_bg.9.png b/res/drawable-land-hdpi/workspace_bg.9.png
new file mode 100644
index 000000000..069bb1f5b
--- /dev/null
+++ b/res/drawable-land-hdpi/workspace_bg.9.png
diff --git a/res/drawable-land-mdpi/hotseat_bg_panel.9.png b/res/drawable-land-mdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 83c4a552b..000000000
--- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-mdpi/search_bg_panel.9.png b/res/drawable-land-mdpi/search_bg_panel.9.png
deleted file mode 100644
index 94bcf6883..000000000
--- a/res/drawable-land-mdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-mdpi/workspace_bg.9.png b/res/drawable-land-mdpi/workspace_bg.9.png
new file mode 100644
index 000000000..611bd5b67
--- /dev/null
+++ b/res/drawable-land-mdpi/workspace_bg.9.png
diff --git a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 8718040c1..000000000
--- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-xhdpi/search_bg_panel.9.png b/res/drawable-land-xhdpi/search_bg_panel.9.png
deleted file mode 100644
index be3a3e812..000000000
--- a/res/drawable-land-xhdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-land-xhdpi/workspace_bg.9.png b/res/drawable-land-xhdpi/workspace_bg.9.png
new file mode 100644
index 000000000..a1f60c645
--- /dev/null
+++ b/res/drawable-land-xhdpi/workspace_bg.9.png
diff --git a/res/drawable-mdpi/hotseat_bg_panel.9.png b/res/drawable-mdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 75609d879..000000000
--- a/res/drawable-mdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/search_bg_panel.9.png b/res/drawable-mdpi/search_bg_panel.9.png
deleted file mode 100644
index 615e9a0dc..000000000
--- a/res/drawable-mdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/workspace_bg.9.png b/res/drawable-mdpi/workspace_bg.9.png
new file mode 100644
index 000000000..a30d9922b
--- /dev/null
+++ b/res/drawable-mdpi/workspace_bg.9.png
diff --git a/res/drawable-xhdpi/hotseat_bg_panel.9.png b/res/drawable-xhdpi/hotseat_bg_panel.9.png
deleted file mode 100644
index 748a3028a..000000000
--- a/res/drawable-xhdpi/hotseat_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/search_bg_panel.9.png b/res/drawable-xhdpi/search_bg_panel.9.png
deleted file mode 100644
index f080337ea..000000000
--- a/res/drawable-xhdpi/search_bg_panel.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/workspace_bg.9.png b/res/drawable-xhdpi/workspace_bg.9.png
new file mode 100644
index 000000000..ceac4f2ee
--- /dev/null
+++ b/res/drawable-xhdpi/workspace_bg.9.png
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index 6802ea007..d75919671 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -16,7 +16,6 @@
 <com.android.launcher2.Hotseat
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:background="@drawable/hotseat_bg_panel"
     launcher:cellCountX="1"
     launcher:cellCountY="@integer/hotseat_cell_count">
     <com.android.launcher2.CellLayout
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 35f1a08ef..99d4181f9 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:id="@+id/drag_layer"
+    android:background="@drawable/workspace_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index b93704339..376173ae9 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -16,7 +16,6 @@
 <com.android.launcher2.Hotseat
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:background="@drawable/hotseat_bg_panel"
     launcher:cellCountX="@integer/hotseat_cell_count"
     launcher:cellCountY="1">
     <com.android.launcher2.CellLayout
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 603038220..34301a35b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -19,6 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:id="@+id/drag_layer"
+    android:background="@drawable/workspace_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6506f955b..65b0f3161 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -116,7 +116,6 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/qsb_bar_height</item>
         <item name="android:layout_gravity">top|center_horizontal</item>
-        <item name="android:background">@drawable/search_bg_panel</item>
         <item name="android:paddingLeft">@dimen/qsb_padding_left</item>
         <item name="android:paddingRight">@dimen/qsb_padding_right</item>
     </style>