summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-11-06 08:52:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-06 08:52:01 -0800
commitf35fac93cdb7bce561da6978c326efb0d7672cd4 (patch)
tree155e5793d87049a8d59df8d260e7741ceab112c9
parent1288608eee837396d0341af0c8774bb945f45e95 (diff)
parentb1b0266dc7dd1e91bc40900085c9bb85356612db (diff)
am b1b0266d: am 8ef6da5c: am b922178d: Merge "More background protection in Recents for status bar" into klp-dev
* commit 'b1b0266dc7dd1e91bc40900085c9bb85356612db': More background protection in Recents for status bar
-rw-r--r--packages/SystemUI/res/drawable-hdpi/bg_protect.9.pngbin0 -> 226 bytes
-rw-r--r--packages/SystemUI/res/drawable-land-hdpi/bg_protect.9.pngbin0 -> 222 bytes
-rw-r--r--packages/SystemUI/res/drawable-land-mdpi/bg_protect.9.pngbin0 -> 201 bytes
-rw-r--r--packages/SystemUI/res/drawable-land-xhdpi/bg_protect.9.pngbin0 -> 235 bytes
-rw-r--r--packages/SystemUI/res/drawable-land-xxhdpi/bg_protect.9.pngbin0 -> 1117 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/bg_protect.9.pngbin0 -> 213 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/bg_protect.9.pngbin0 -> 255 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/bg_protect.9.pngbin0 -> 1126 bytes
-rw-r--r--packages/SystemUI/res/layout-land/status_bar_recent_panel.xml1
-rw-r--r--packages/SystemUI/res/layout/status_bar_recent_panel.xml1
10 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-hdpi/bg_protect.9.png
new file mode 100644
index 000000000000..5bbfa4fff6bb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-land-hdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-land-hdpi/bg_protect.9.png
new file mode 100644
index 000000000000..1a58144aaf6d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-land-hdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-land-mdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-land-mdpi/bg_protect.9.png
new file mode 100644
index 000000000000..a12519ebdc33
--- /dev/null
+++ b/packages/SystemUI/res/drawable-land-mdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-land-xhdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-land-xhdpi/bg_protect.9.png
new file mode 100644
index 000000000000..ce414549a095
--- /dev/null
+++ b/packages/SystemUI/res/drawable-land-xhdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-land-xxhdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-land-xxhdpi/bg_protect.9.png
new file mode 100644
index 000000000000..b0b456198c6d
--- /dev/null
+++ b/packages/SystemUI/res/drawable-land-xxhdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-mdpi/bg_protect.9.png
new file mode 100644
index 000000000000..2856e0985158
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-xhdpi/bg_protect.9.png
new file mode 100644
index 000000000000..72269f207a5a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/bg_protect.9.png b/packages/SystemUI/res/drawable-xxhdpi/bg_protect.9.png
new file mode 100644
index 000000000000..efc9b0465881
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xxhdpi/bg_protect.9.png
Binary files differ
diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
index b2ba25a38bd7..0c0be29bdbe4 100644
--- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
+++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
@@ -24,6 +24,7 @@
android:id="@+id/recents_root"
android:layout_height="match_parent"
android:layout_width="match_parent"
+ android:foreground="@drawable/bg_protect"
systemui:recentItemLayout="@layout/status_bar_recent_item"
>
<FrameLayout
diff --git a/packages/SystemUI/res/layout/status_bar_recent_panel.xml b/packages/SystemUI/res/layout/status_bar_recent_panel.xml
index e41475b41a56..2f3968dff662 100644
--- a/packages/SystemUI/res/layout/status_bar_recent_panel.xml
+++ b/packages/SystemUI/res/layout/status_bar_recent_panel.xml
@@ -24,6 +24,7 @@
android:id="@+id/recents_root"
android:layout_height="match_parent"
android:layout_width="match_parent"
+ android:foreground="@drawable/bg_protect"
systemui:recentItemLayout="@layout/status_bar_recent_item"
>
<FrameLayout