diff options
author | Adam Powell <adamp@google.com> | 2011-08-05 10:29:49 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-05 10:29:49 -0700 |
commit | b83316f8c8a98ae95404abaea9dde010f66d58c5 (patch) | |
tree | 855de92643ab5195bc77d419d479eef2992afac5 | |
parent | c4dd43b4013eb0a027545597e4e0ddb8d2ec6286 (diff) | |
parent | 13cd10cc2df9189445d95d7b792990af65592933 (diff) | |
download | frameworks_base-b83316f8c8a98ae95404abaea9dde010f66d58c5.zip frameworks_base-b83316f8c8a98ae95404abaea9dde010f66d58c5.tar.gz frameworks_base-b83316f8c8a98ae95404abaea9dde010f66d58c5.tar.bz2 |
Merge "Fix bug 5111513 - Spinner asset updates for action bars"
54 files changed, 27 insertions, 17 deletions
diff --git a/core/res/res/drawable-hdpi/spinner_ab_activated_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_ab_activated_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..d471c30 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_activated_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_activated_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_ab_activated_holo_light.9.png Binary files differnew file mode 100644 index 0000000..d471c30 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_activated_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_default_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_ab_default_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..001cfbb --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_default_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_default_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_ab_default_holo_light.9.png Binary files differnew file mode 100644 index 0000000..5e278c8 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_default_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..cf2e149 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png Binary files differnew file mode 100644 index 0000000..63f212d --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_ab_focused_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..85663e6 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_focused_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png Binary files differnew file mode 100644 index 0000000..85663e6 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..afddbe8 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png Binary files differnew file mode 100644 index 0000000..0ad6476 --- /dev/null +++ b/core/res/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png Binary files differdeleted file mode 100644 index 7cad0c9..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png Binary files differdeleted file mode 100644 index 7cad0c9..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png Binary files differdeleted file mode 100644 index b3f3cf7..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png Binary files differdeleted file mode 100644 index af46631..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index e672c95..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png Binary files differdeleted file mode 100644 index f499540..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png Binary files differdeleted file mode 100644 index f4900a5..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png Binary files differdeleted file mode 100644 index 1286542..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png Binary files differdeleted file mode 100644 index 8b6f9dd..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png Binary files differdeleted file mode 100644 index 4f0c476..0000000 --- a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_ab_activated_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_ab_activated_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..34c9188 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_activated_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_activated_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_ab_activated_holo_light.9.png Binary files differnew file mode 100644 index 0000000..34c9188 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_activated_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_default_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_ab_default_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..b92abaf --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_default_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_ab_default_holo_light.9.png Binary files differnew file mode 100644 index 0000000..91f0e87 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..dab7eda --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png Binary files differnew file mode 100644 index 0000000..bf14605 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_ab_focused_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..c733260 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_focused_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png Binary files differnew file mode 100644 index 0000000..c733260 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..6d290a6 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png Binary files differnew file mode 100644 index 0000000..6dae484 --- /dev/null +++ b/core/res/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png Binary files differdeleted file mode 100644 index 617c379..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png Binary files differdeleted file mode 100644 index 617c379..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png Binary files differdeleted file mode 100644 index d76b123..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png Binary files differdeleted file mode 100644 index ee91044..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index fc9c109..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png Binary files differdeleted file mode 100644 index 7fc7cc1..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png Binary files differdeleted file mode 100644 index 0f49fe9..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png Binary files differdeleted file mode 100644 index 032d5d3..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png Binary files differdeleted file mode 100644 index df0a935..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png Binary files differdeleted file mode 100644 index b43177b..0000000 --- a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_dark.9.png b/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..85d8540 --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_light.9.png b/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_light.9.png Binary files differnew file mode 100644 index 0000000..85d8540 --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_activated_holo_light.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_default_holo_dark.9.png b/core/res/res/drawable-xhdpi/spinner_ab_default_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..31b39d7 --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_default_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png b/core/res/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png Binary files differnew file mode 100644 index 0000000..1527c5c --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_dark.9.png b/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..e4cef9a --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png b/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png Binary files differnew file mode 100644 index 0000000..1c37ece --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_dark.9.png b/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..6aae46b --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png b/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png Binary files differnew file mode 100644 index 0000000..6aae46b --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_dark.9.png b/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..db2e034 --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png b/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png Binary files differnew file mode 100644 index 0000000..77bb433 --- /dev/null +++ b/core/res/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png diff --git a/core/res/res/drawable/spinner_cab_background_holo_dark.xml b/core/res/res/drawable/spinner_ab_holo_dark.xml index 5572450..708b6ab 100644 --- a/core/res/res/drawable/spinner_cab_background_holo_dark.xml +++ b/core/res/res/drawable/spinner_ab_holo_dark.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. @@ -16,10 +16,12 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:drawable="@drawable/spinner_cab_disabled_holo_dark" /> + android:drawable="@drawable/spinner_ab_disabled_holo_dark" /> <item android:state_pressed="true" - android:drawable="@drawable/spinner_cab_pressed_holo_dark" /> + android:drawable="@drawable/spinner_ab_pressed_holo_dark" /> <item android:state_pressed="false" android:state_focused="true" - android:drawable="@drawable/spinner_cab_focused_holo_dark" /> - <item android:drawable="@drawable/spinner_cab_default_holo_dark" /> + android:drawable="@drawable/spinner_ab_focused_holo_dark" /> + <item android:state_activated="true" + android:drawable="@drawable/spinner_ab_activated_holo_dark" /> + <item android:drawable="@drawable/spinner_ab_default_holo_dark" /> </selector> diff --git a/core/res/res/drawable/spinner_cab_background_holo_light.xml b/core/res/res/drawable/spinner_ab_holo_light.xml index 98ff48d..c4901ca 100644 --- a/core/res/res/drawable/spinner_cab_background_holo_light.xml +++ b/core/res/res/drawable/spinner_ab_holo_light.xml @@ -16,10 +16,12 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" - android:drawable="@drawable/spinner_cab_disabled_holo_light" /> + android:drawable="@drawable/spinner_ab_disabled_holo_light" /> <item android:state_pressed="true" - android:drawable="@drawable/spinner_cab_pressed_holo_light" /> + android:drawable="@drawable/spinner_ab_pressed_holo_light" /> <item android:state_pressed="false" android:state_focused="true" - android:drawable="@drawable/spinner_cab_focused_holo_light" /> - <item android:drawable="@drawable/spinner_cab_default_holo_light" /> + android:drawable="@drawable/spinner_ab_focused_holo_light" /> + <item android:state_activated="true" + android:drawable="@drawable/spinner_ab_activated_holo_light" /> + <item android:drawable="@drawable/spinner_ab_default_holo_light" /> </selector> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index fa9f1d1..753e4ac 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -217,14 +217,18 @@ <item>@drawable/scrollbar_handle_vertical</item> <item>@drawable/spinner_background_holo_dark</item> <item>@drawable/spinner_background_holo_light</item> - <item>@drawable/spinner_cab_default_holo_dark</item> - <item>@drawable/spinner_cab_default_holo_light</item> - <item>@drawable/spinner_cab_disabled_holo_dark</item> - <item>@drawable/spinner_cab_disabled_holo_light</item> - <item>@drawable/spinner_cab_focused_holo_dark</item> - <item>@drawable/spinner_cab_focused_holo_light</item> - <item>@drawable/spinner_cab_pressed_holo_dark</item> - <item>@drawable/spinner_cab_pressed_holo_light</item> + <item>@drawable/spinner_ab_default_holo_dark</item> + <item>@drawable/spinner_ab_default_holo_light</item> + <item>@drawable/spinner_ab_disabled_holo_dark</item> + <item>@drawable/spinner_ab_disabled_holo_light</item> + <item>@drawable/spinner_ab_focused_holo_dark</item> + <item>@drawable/spinner_ab_focused_holo_light</item> + <item>@drawable/spinner_ab_pressed_holo_dark</item> + <item>@drawable/spinner_ab_pressed_holo_light</item> + <item>@drawable/spinner_ab_activated_holo_dark</item> + <item>@drawable/spinner_ab_activated_holo_light</item> + <item>@drawable/spinner_ab_holo_dark</item> + <item>@drawable/spinner_ab_holo_light</item> <item>@drawable/spinner_default_holo_dark</item> <item>@drawable/spinner_default_holo_light</item> <item>@drawable/spinner_disabled_holo_dark</item> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 21f1cef..0c6e20f 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1744,6 +1744,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Holo.Spinner.DropDown.ActionBar"> + <item name="android:background">@android:drawable/spinner_ab_holo_dark</item> </style> <style name="Widget.Holo.CompoundButton.Star" parent="Widget.CompoundButton.Star"> @@ -2131,6 +2132,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Holo.Light.Spinner.DropDown.ActionBar"> + <item name="android:background">@android:drawable/spinner_ab_holo_light</item> </style> <style name="Widget.Holo.Light.CompoundButton.Star" parent="Widget.CompoundButton.Star"> |