From 90576b5f095371e1ba4fedcb775f43715adf9634 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 27 Sep 2011 17:45:27 -0700
Subject: 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
---
 res/drawable-hdpi/ic_allapps_pressed.png           | Bin 0 -> 9242 bytes
 res/drawable-hdpi/ic_launcher_appwidget.png        | Bin 6399 -> 0 bytes
 .../pressed_application_background.9.png           | Bin 1348 -> 0 bytes
 res/drawable-hdpi/preview_bg.9.png                 | Bin 1584 -> 0 bytes
 res/drawable-hdpi/preview_bg_focus.9.png           | Bin 1781 -> 0 bytes
 res/drawable-hdpi/preview_bg_press.9.png           | Bin 1778 -> 0 bytes
 res/drawable-mdpi/apps_hotseat_button.png          | Bin 1736 -> 0 bytes
 res/drawable-mdpi/ic_allapps_pressed.png           | Bin 0 -> 6467 bytes
 res/drawable-mdpi/ic_launcher_appwidget.png        | Bin 4224 -> 0 bytes
 .../pressed_application_background.9.png           | Bin 899 -> 0 bytes
 res/drawable-mdpi/preview_bg.9.png                 | Bin 1042 -> 0 bytes
 res/drawable-mdpi/preview_bg_focus.9.png           | Bin 1207 -> 0 bytes
 res/drawable-mdpi/preview_bg_press.9.png           | Bin 1188 -> 0 bytes
 res/drawable-xhdpi/apps_hotseat_button.png         | Bin 11217 -> 0 bytes
 res/drawable-xhdpi/ic_allapps_pressed.png          | Bin 0 -> 12548 bytes
 res/drawable-xhdpi/ic_launcher_appwidget.png       | Bin 11507 -> 0 bytes
 .../pressed_application_background.9.png           | Bin 2811 -> 0 bytes
 res/drawable-xhdpi/preview_bg.9.png                | Bin 2989 -> 0 bytes
 res/drawable-xhdpi/preview_bg_focus.9.png          | Bin 3650 -> 0 bytes
 res/drawable-xhdpi/preview_bg_press.9.png          | Bin 3640 -> 0 bytes
 res/drawable/all_apps_button_icon.xml              |  21 ++++++++++++++++++++
 res/drawable/preview_background.xml                |  22 ---------------------
 res/values/styles.xml                              |   2 ++
 23 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_allapps_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_launcher_appwidget.png
 delete mode 100644 res/drawable-hdpi/pressed_application_background.9.png
 delete mode 100644 res/drawable-hdpi/preview_bg.9.png
 delete mode 100644 res/drawable-hdpi/preview_bg_focus.9.png
 delete mode 100644 res/drawable-hdpi/preview_bg_press.9.png
 delete mode 100644 res/drawable-mdpi/apps_hotseat_button.png
 create mode 100644 res/drawable-mdpi/ic_allapps_pressed.png
 delete mode 100644 res/drawable-mdpi/ic_launcher_appwidget.png
 delete mode 100644 res/drawable-mdpi/pressed_application_background.9.png
 delete mode 100644 res/drawable-mdpi/preview_bg.9.png
 delete mode 100644 res/drawable-mdpi/preview_bg_focus.9.png
 delete mode 100644 res/drawable-mdpi/preview_bg_press.9.png
 delete mode 100644 res/drawable-xhdpi/apps_hotseat_button.png
 create mode 100644 res/drawable-xhdpi/ic_allapps_pressed.png
 delete mode 100644 res/drawable-xhdpi/ic_launcher_appwidget.png
 delete mode 100644 res/drawable-xhdpi/pressed_application_background.9.png
 delete mode 100644 res/drawable-xhdpi/preview_bg.9.png
 delete mode 100644 res/drawable-xhdpi/preview_bg_focus.9.png
 delete mode 100644 res/drawable-xhdpi/preview_bg_press.9.png
 create mode 100644 res/drawable/all_apps_button_icon.xml
 delete mode 100644 res/drawable/preview_background.xml

(limited to 'res')

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
Binary files /dev/null and b/res/drawable-hdpi/ic_allapps_pressed.png 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
Binary files a/res/drawable-hdpi/ic_launcher_appwidget.png and /dev/null 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
Binary files a/res/drawable-hdpi/pressed_application_background.9.png and /dev/null 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
Binary files a/res/drawable-hdpi/preview_bg.9.png and /dev/null 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
Binary files a/res/drawable-hdpi/preview_bg_focus.9.png and /dev/null 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
Binary files a/res/drawable-hdpi/preview_bg_press.9.png and /dev/null 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
Binary files a/res/drawable-mdpi/apps_hotseat_button.png and /dev/null 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
Binary files /dev/null and b/res/drawable-mdpi/ic_allapps_pressed.png 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
Binary files a/res/drawable-mdpi/ic_launcher_appwidget.png and /dev/null 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
Binary files a/res/drawable-mdpi/pressed_application_background.9.png and /dev/null 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
Binary files a/res/drawable-mdpi/preview_bg.9.png and /dev/null 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
Binary files a/res/drawable-mdpi/preview_bg_focus.9.png and /dev/null 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
Binary files a/res/drawable-mdpi/preview_bg_press.9.png and /dev/null 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
Binary files a/res/drawable-xhdpi/apps_hotseat_button.png and /dev/null 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
Binary files /dev/null and b/res/drawable-xhdpi/ic_allapps_pressed.png 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
Binary files a/res/drawable-xhdpi/ic_launcher_appwidget.png and /dev/null 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
Binary files a/res/drawable-xhdpi/pressed_application_background.9.png and /dev/null 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
Binary files a/res/drawable-xhdpi/preview_bg.9.png and /dev/null 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
Binary files a/res/drawable-xhdpi/preview_bg_focus.9.png and /dev/null 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
Binary files a/res/drawable-xhdpi/preview_bg_press.9.png and /dev/null differ
diff --git a/res/drawable/all_apps_button_icon.xml b/res/drawable/all_apps_button_icon.xml
new file mode 100644
index 000000000..7c69cad3a
--- /dev/null
+++ b/res/drawable/all_apps_button_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/drawable/preview_background.xml b/res/drawable/preview_background.xml
deleted file mode 100644
index 0054aa03e..000000000
--- a/res/drawable/preview_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<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" />
-</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>
-- 
cgit v1.2.3