summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPeter Ng <petergng@google.com>2011-11-07 14:37:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-07 14:37:31 -0800
commite1aacdfe26eabf1ff31a6ddd8590fdea360614db (patch)
tree31f5b53f114f256ea39db6c89c1a09150288a425 /core
parent4d8ecc65c5a747f350492b21397d7466ff628900 (diff)
parentd52ec9f3c28c9c02c3d06ccc0a1097d01120735f (diff)
downloadframeworks_base-e1aacdfe26eabf1ff31a6ddd8590fdea360614db.zip
frameworks_base-e1aacdfe26eabf1ff31a6ddd8590fdea360614db.tar.gz
frameworks_base-e1aacdfe26eabf1ff31a6ddd8590fdea360614db.tar.bz2
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
Diffstat (limited to 'core')
-rw-r--r--core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark.9.pngbin0 -> 721 bytes
-rw-r--r--core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_light.9.pngbin0 -> 653 bytes
-rw-r--r--core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark.9.pngbin0 -> 456 bytes
-rw-r--r--core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_light.9.pngbin0 -> 396 bytes
-rw-r--r--core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark.9.pngbin0 -> 765 bytes
-rw-r--r--core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light.9.pngbin0 -> 639 bytes
-rw-r--r--core/res/res/drawable/quickcontact_badge_overlay_dark.xml12
-rw-r--r--core/res/res/drawable/quickcontact_badge_overlay_light.xml12
8 files changed, 12 insertions, 12 deletions
diff --git a/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark.9.png b/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark.9.png
new file mode 100644
index 0000000..cbd8c5c
--- /dev/null
+++ b/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_dark.9.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_light.9.png b/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_light.9.png
new file mode 100644
index 0000000..f7f4ba3
--- /dev/null
+++ b/core/res/res/drawable-hdpi/quickcontact_badge_overlay_focused_light.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark.9.png b/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark.9.png
new file mode 100644
index 0000000..d12a196
--- /dev/null
+++ b/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_dark.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_light.9.png b/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_light.9.png
new file mode 100644
index 0000000..27c7977
--- /dev/null
+++ b/core/res/res/drawable-mdpi/quickcontact_badge_overlay_focused_light.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark.9.png b/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark.9.png
new file mode 100644
index 0000000..6927834
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_dark.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light.9.png b/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light.9.png
new file mode 100644
index 0000000..4bce527
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/quickcontact_badge_overlay_focused_light.9.png
Binary files differ
diff --git a/core/res/res/drawable/quickcontact_badge_overlay_dark.xml b/core/res/res/drawable/quickcontact_badge_overlay_dark.xml
index 972488d..6bd7403 100644
--- a/core/res/res/drawable/quickcontact_badge_overlay_dark.xml
+++ b/core/res/res/drawable/quickcontact_badge_overlay_dark.xml
@@ -16,13 +16,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:state_focused="false"
- android:state_selected="false"
- android:state_pressed="false"
- android:drawable="@drawable/quickcontact_badge_overlay_normal_dark" />
-
- <item
android:state_pressed="true"
android:drawable="@drawable/quickcontact_badge_overlay_pressed_dark" />
+ <item
+ android:state_pressed="false"
+ android:state_focused="true"
+ android:drawable="@drawable/quickcontact_badge_overlay_focused_dark" />
+ <item
+ android:drawable="@drawable/quickcontact_badge_overlay_normal_dark" />
</selector>
diff --git a/core/res/res/drawable/quickcontact_badge_overlay_light.xml b/core/res/res/drawable/quickcontact_badge_overlay_light.xml
index bf95d52..cf7f916 100644
--- a/core/res/res/drawable/quickcontact_badge_overlay_light.xml
+++ b/core/res/res/drawable/quickcontact_badge_overlay_light.xml
@@ -16,13 +16,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:state_focused="false"
- android:state_selected="false"
- android:state_pressed="false"
- android:drawable="@drawable/quickcontact_badge_overlay_normal_light" />
-
- <item
android:state_pressed="true"
android:drawable="@drawable/quickcontact_badge_overlay_pressed_light" />
+ <item
+ android:state_pressed="false"
+ android:state_focused="true"
+ android:drawable="@drawable/quickcontact_badge_overlay_focused_light" />
+ <item
+ android:drawable="@drawable/quickcontact_badge_overlay_normal_light" />
</selector>