diff options
author | Winson Chung <winsonc@google.com> | 2011-09-28 11:46:09 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-28 11:46:09 -0700 |
commit | c5d2a7b0d6b85999731cc82ff945635fdea1e670 (patch) | |
tree | a5f2daf4df9e1bcaf761f84ea2636c5e41a4a073 /res | |
parent | 5f09e62c80e6d50350cbc64c7500e7f6772a9848 (diff) | |
parent | 90576b5f095371e1ba4fedcb775f43715adf9634 (diff) | |
download | android_packages_apps_Trebuchet-c5d2a7b0d6b85999731cc82ff945635fdea1e670.tar.gz android_packages_apps_Trebuchet-c5d2a7b0d6b85999731cc82ff945635fdea1e670.tar.bz2 android_packages_apps_Trebuchet-c5d2a7b0d6b85999731cc82ff945635fdea1e670.zip |
Merge "Fixing some small issues."
Diffstat (limited to 'res')
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 Binary files differnew file mode 100644 index 000000000..6d87bbb23 --- /dev/null +++ b/res/drawable-hdpi/ic_allapps_pressed.png diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png Binary files differdeleted file mode 100644 index 13513e03c..000000000 --- a/res/drawable-hdpi/ic_launcher_appwidget.png +++ /dev/null diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png Binary files differdeleted file mode 100644 index 3a59f255f..000000000 --- a/res/drawable-hdpi/pressed_application_background.9.png +++ /dev/null diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png Binary files differdeleted file mode 100644 index 5fa2ed82c..000000000 --- a/res/drawable-hdpi/preview_bg.9.png +++ /dev/null diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png Binary files differdeleted file mode 100644 index bbf67f7a2..000000000 --- a/res/drawable-hdpi/preview_bg_focus.9.png +++ /dev/null diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png Binary files differdeleted file mode 100644 index 6d0b02298..000000000 --- a/res/drawable-hdpi/preview_bg_press.9.png +++ /dev/null diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png Binary files differdeleted file mode 100644 index 62f119d67..000000000 --- a/res/drawable-mdpi/apps_hotseat_button.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png Binary files differnew file mode 100644 index 000000000..5c2076f24 --- /dev/null +++ b/res/drawable-mdpi/ic_allapps_pressed.png diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png Binary files differdeleted file mode 100644 index 72dbfdf6b..000000000 --- a/res/drawable-mdpi/ic_launcher_appwidget.png +++ /dev/null diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png Binary files differdeleted file mode 100644 index 7d5da3da2..000000000 --- a/res/drawable-mdpi/pressed_application_background.9.png +++ /dev/null diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png Binary files differdeleted file mode 100644 index d96e88543..000000000 --- a/res/drawable-mdpi/preview_bg.9.png +++ /dev/null diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png Binary files differdeleted file mode 100644 index 19e82a773..000000000 --- a/res/drawable-mdpi/preview_bg_focus.9.png +++ /dev/null diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png Binary files differdeleted file mode 100644 index f9380903b..000000000 --- a/res/drawable-mdpi/preview_bg_press.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png Binary files differdeleted file mode 100644 index 932dac7c9..000000000 --- a/res/drawable-xhdpi/apps_hotseat_button.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png Binary files differnew file mode 100644 index 000000000..72ff3b974 --- /dev/null +++ b/res/drawable-xhdpi/ic_allapps_pressed.png diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png Binary files differdeleted file mode 100644 index 997504abe..000000000 --- a/res/drawable-xhdpi/ic_launcher_appwidget.png +++ /dev/null diff --git a/res/drawable-xhdpi/pressed_application_background.9.png b/res/drawable-xhdpi/pressed_application_background.9.png Binary files differdeleted file mode 100644 index 05e240a9e..000000000 --- a/res/drawable-xhdpi/pressed_application_background.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png Binary files differdeleted file mode 100644 index 11cbcb5a2..000000000 --- a/res/drawable-xhdpi/preview_bg.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/preview_bg_focus.9.png b/res/drawable-xhdpi/preview_bg_focus.9.png Binary files differdeleted file mode 100644 index 698c465e3..000000000 --- a/res/drawable-xhdpi/preview_bg_focus.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/preview_bg_press.9.png b/res/drawable-xhdpi/preview_bg_press.9.png Binary files differdeleted file mode 100644 index 78e751099..000000000 --- a/res/drawable-xhdpi/preview_bg_press.9.png +++ /dev/null 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> |