summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-09-27 17:45:27 -0700
committerWinson Chung <winsonc@google.com>2011-09-27 18:46:06 -0700
commit90576b5f095371e1ba4fedcb775f43715adf9634 (patch)
tree74786c61008e2a706983dd9c370f928b3ac36a62 /res
parent164babc69ce3302e2f90f5621a3f9761bbb5148b (diff)
downloadandroid_packages_apps_Trebuchet-90576b5f095371e1ba4fedcb775f43715adf9634.tar.gz
android_packages_apps_Trebuchet-90576b5f095371e1ba4fedcb775f43715adf9634.tar.bz2
android_packages_apps_Trebuchet-90576b5f095371e1ba4fedcb775f43715adf9634.zip
Fixing some small issues.
- Adding All Apps pressed state (5375824) - Ensuring the drop targets are single line (5375563) - Adding some checks in kb focus logic to appease some frantic monkeys (4508638) - Removing some unused assets Change-Id: I46702ee25c638849c716f0d8428f68c2b06c1c2e
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_allapps_pressed.pngbin0 -> 9242 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_appwidget.pngbin6399 -> 0 bytes
-rw-r--r--res/drawable-hdpi/pressed_application_background.9.pngbin1348 -> 0 bytes
-rw-r--r--res/drawable-hdpi/preview_bg.9.pngbin1584 -> 0 bytes
-rw-r--r--res/drawable-hdpi/preview_bg_focus.9.pngbin1781 -> 0 bytes
-rw-r--r--res/drawable-hdpi/preview_bg_press.9.pngbin1778 -> 0 bytes
-rw-r--r--res/drawable-mdpi/apps_hotseat_button.pngbin1736 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_allapps_pressed.pngbin0 -> 6467 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_appwidget.pngbin4224 -> 0 bytes
-rw-r--r--res/drawable-mdpi/pressed_application_background.9.pngbin899 -> 0 bytes
-rw-r--r--res/drawable-mdpi/preview_bg.9.pngbin1042 -> 0 bytes
-rw-r--r--res/drawable-mdpi/preview_bg_focus.9.pngbin1207 -> 0 bytes
-rw-r--r--res/drawable-mdpi/preview_bg_press.9.pngbin1188 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/apps_hotseat_button.pngbin11217 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_allapps_pressed.pngbin0 -> 12548 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_appwidget.pngbin11507 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/pressed_application_background.9.pngbin2811 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg.9.pngbin2989 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg_focus.9.pngbin3650 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg_press.9.pngbin3640 -> 0 bytes
-rw-r--r--res/drawable/all_apps_button_icon.xml (renamed from res/drawable/preview_background.xml)9
-rw-r--r--res/values/styles.xml2
22 files changed, 6 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png
new file mode 100644
index 000000000..6d87bbb23
--- /dev/null
+++ b/res/drawable-hdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
deleted file mode 100644
index 13513e03c..000000000
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png
deleted file mode 100644
index 3a59f255f..000000000
--- a/res/drawable-hdpi/pressed_application_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png
deleted file mode 100644
index 5fa2ed82c..000000000
--- a/res/drawable-hdpi/preview_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png
deleted file mode 100644
index bbf67f7a2..000000000
--- a/res/drawable-hdpi/preview_bg_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png
deleted file mode 100644
index 6d0b02298..000000000
--- a/res/drawable-hdpi/preview_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png
deleted file mode 100644
index 62f119d67..000000000
--- a/res/drawable-mdpi/apps_hotseat_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png
new file mode 100644
index 000000000..5c2076f24
--- /dev/null
+++ b/res/drawable-mdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png
deleted file mode 100644
index 72dbfdf6b..000000000
--- a/res/drawable-mdpi/ic_launcher_appwidget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
deleted file mode 100644
index 7d5da3da2..000000000
--- a/res/drawable-mdpi/pressed_application_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png
deleted file mode 100644
index d96e88543..000000000
--- a/res/drawable-mdpi/preview_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png
deleted file mode 100644
index 19e82a773..000000000
--- a/res/drawable-mdpi/preview_bg_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png
deleted file mode 100644
index f9380903b..000000000
--- a/res/drawable-mdpi/preview_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png
deleted file mode 100644
index 932dac7c9..000000000
--- a/res/drawable-xhdpi/apps_hotseat_button.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png
new file mode 100644
index 000000000..72ff3b974
--- /dev/null
+++ b/res/drawable-xhdpi/ic_allapps_pressed.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png
deleted file mode 100644
index 997504abe..000000000
--- a/res/drawable-xhdpi/ic_launcher_appwidget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/pressed_application_background.9.png b/res/drawable-xhdpi/pressed_application_background.9.png
deleted file mode 100644
index 05e240a9e..000000000
--- a/res/drawable-xhdpi/pressed_application_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png
deleted file mode 100644
index 11cbcb5a2..000000000
--- a/res/drawable-xhdpi/preview_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg_focus.9.png b/res/drawable-xhdpi/preview_bg_focus.9.png
deleted file mode 100644
index 698c465e3..000000000
--- a/res/drawable-xhdpi/preview_bg_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg_press.9.png b/res/drawable-xhdpi/preview_bg_press.9.png
deleted file mode 100644
index 78e751099..000000000
--- a/res/drawable-xhdpi/preview_bg_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/preview_background.xml b/res/drawable/all_apps_button_icon.xml
index 0054aa03e..7c69cad3a 100644
--- a/res/drawable/preview_background.xml
+++ b/res/drawable/all_apps_button_icon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/preview_bg_press" />
- <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/preview_bg_focus" />
- <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/preview_bg" />
- <item android:drawable="@drawable/preview_bg" />
+ <item android:state_focused="true" android:drawable="@drawable/ic_allapps_pressed" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_allapps_pressed" />
+ <item android:drawable="@drawable/ic_allapps" />
</selector>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 19a05a0a1..de438bec2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -146,6 +146,8 @@
<item name="android:paddingRight">25dp</item>
<item name="android:textColor">#FFFFFFFF</item>
<item name="android:textSize">16sp</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">end</item>
<item name="android:shadowColor">#FF000000</item>
<item name="android:shadowDx">0.0</item>
<item name="android:shadowDy">1.0</item>