Merge "Workaround for default workspace widgets not getting notified for new widget sizes. (Bug 6439962)" into jb-dev
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 6724b7a..0000000
--- a/res/drawable-hdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 f2a63f9..0000000
--- a/res/drawable-hdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/workspace_bg.9.png b/res/drawable-hdpi/workspace_bg.9.png
new file mode 100644
index 0000000..eeed8e7
--- /dev/null
+++ b/res/drawable-hdpi/workspace_bg.9.png
Binary files differ
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 90177f8..0000000
--- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 78f80c9..0000000
--- a/res/drawable-land-hdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
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 0000000..069bb1f
--- /dev/null
+++ b/res/drawable-land-hdpi/workspace_bg.9.png
Binary files differ
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 83c4a55..0000000
--- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 94bcf68..0000000
--- a/res/drawable-land-mdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
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 0000000..611bd5b
--- /dev/null
+++ b/res/drawable-land-mdpi/workspace_bg.9.png
Binary files differ
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 8718040..0000000
--- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 be3a3e8..0000000
--- a/res/drawable-land-xhdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
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 0000000..a1f60c6
--- /dev/null
+++ b/res/drawable-land-xhdpi/workspace_bg.9.png
Binary files differ
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 75609d8..0000000
--- a/res/drawable-mdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 615e9a0..0000000
--- a/res/drawable-mdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/workspace_bg.9.png b/res/drawable-mdpi/workspace_bg.9.png
new file mode 100644
index 0000000..a30d992
--- /dev/null
+++ b/res/drawable-mdpi/workspace_bg.9.png
Binary files differ
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 748a302..0000000
--- a/res/drawable-xhdpi/hotseat_bg_panel.9.png
+++ /dev/null
Binary files differ
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 f080337..0000000
--- a/res/drawable-xhdpi/search_bg_panel.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/workspace_bg.9.png b/res/drawable-xhdpi/workspace_bg.9.png
new file mode 100644
index 0000000..ceac4f2
--- /dev/null
+++ b/res/drawable-xhdpi/workspace_bg.9.png
Binary files differ
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index 6802ea0..d759196 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 35f1a08..99d4181 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 b937043..376173a 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 6030382..34301a3 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 6506f95..65b0f31 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>
