summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Prueter <saschap@google.com>2012-11-07 14:12:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-07 14:12:40 -0800
commitde974f6f201a9aed3f811c97edf4db3ecd41eb3d (patch)
tree5d3d4d189fd54b4a5462c06b3d0f25cf7c3b9df8
parenteb6cbc22b264af26a20065942899a27abbc867eb (diff)
parent972dd431f81432f1bbb33d2e7f34fcd5f4764870 (diff)
downloadframeworks_base-de974f6f201a9aed3f811c97edf4db3ecd41eb3d.zip
frameworks_base-de974f6f201a9aed3f811c97edf4db3ecd41eb3d.tar.gz
frameworks_base-de974f6f201a9aed3f811c97edf4db3ecd41eb3d.tar.bz2
am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870': Final icon for notifications panel
-rw-r--r--packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.pngbin1719 -> 1269 bytes
-rw-r--r--packages/SystemUI/res/drawable-hdpi/ic_notify_open_pressed.pngbin1912 -> 1405 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.pngbin1208 -> 935 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_notify_open_pressed.pngbin1213 -> 962 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.pngbin2204 -> 1641 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/ic_notify_open_pressed.pngbin2716 -> 1918 bytes
-rw-r--r--packages/SystemUI/res/drawable/ic_notifications.xml4
7 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png
index 2adafea..ca56ad4 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_normal.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_pressed.png
index 8521ffc..1a14231 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_notify_open_pressed.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_notify_open_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png
index 2ab0cd7..f04aab1 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_normal.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_pressed.png
index 49ac94b..549c5efd 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_notify_open_pressed.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_notify_open_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png
index b0e35a1..56386f8 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_normal.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_pressed.png
index 42bbbbc..501c777 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_pressed.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_notify_open_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/ic_notifications.xml b/packages/SystemUI/res/drawable/ic_notifications.xml
index 68c4774..97a7623 100644
--- a/packages/SystemUI/res/drawable/ic_notifications.xml
+++ b/packages/SystemUI/res/drawable/ic_notifications.xml
@@ -16,8 +16,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/ic_notifications_normal" />
+ android:drawable="@drawable/ic_notify_open_normal" />
<item
- android:drawable="@drawable/ic_notifications_normal" />
+ android:drawable="@drawable/ic_notify_open_normal" />
</selector>