diff options
author | Justin Ho <justinho@google.com> | 2011-09-16 14:16:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-16 14:16:53 -0700 |
commit | 9e1184f2efda48c93eee356b0b4c420f77747cb2 (patch) | |
tree | cd7110c10112d5c0a01b7bf4212dbeb4744e8fcf /core | |
parent | 9404e1fbd983c16667b9ec31941038c7af2df803 (diff) | |
parent | 5855c0ca68de7103e59e4a6e6996fba528cabd9a (diff) | |
download | frameworks_base-9e1184f2efda48c93eee356b0b4c420f77747cb2.zip frameworks_base-9e1184f2efda48c93eee356b0b4c420f77747cb2.tar.gz frameworks_base-9e1184f2efda48c93eee356b0b4c420f77747cb2.tar.bz2 |
am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
* commit '5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
Diffstat (limited to 'core')
16 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png Binary files differindex a231195..e0f55bf 100644 --- a/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png +++ b/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png diff --git a/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png Binary files differnew file mode 100644 index 0000000..7b264f1 --- /dev/null +++ b/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png diff --git a/core/res/res/drawable-hdpi/scrubber_control_holo.png b/core/res/res/drawable-hdpi/scrubber_control_holo.png Binary files differdeleted file mode 100644 index fae05e5..0000000 --- a/core/res/res/drawable-hdpi/scrubber_control_holo.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png Binary files differnew file mode 100644 index 0000000..c3a5f7d --- /dev/null +++ b/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png diff --git a/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png Binary files differindex ff4d710..6fa4e00 100644 --- a/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png +++ b/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png diff --git a/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png Binary files differindex 9d7b77c..a035f6f 100644 --- a/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png +++ b/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png diff --git a/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png Binary files differnew file mode 100644 index 0000000..5c9720f --- /dev/null +++ b/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png diff --git a/core/res/res/drawable-mdpi/scrubber_control_holo.png b/core/res/res/drawable-mdpi/scrubber_control_holo.png Binary files differdeleted file mode 100644 index 832fa07..0000000 --- a/core/res/res/drawable-mdpi/scrubber_control_holo.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png Binary files differnew file mode 100644 index 0000000..2497716 --- /dev/null +++ b/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png diff --git a/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png Binary files differindex 4a518f2..5fc3ca2 100644 --- a/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png +++ b/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png diff --git a/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png Binary files differindex 0b0bf24..d70151a 100644 --- a/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png +++ b/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png diff --git a/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png Binary files differnew file mode 100644 index 0000000..017688f --- /dev/null +++ b/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png diff --git a/core/res/res/drawable-xhdpi/scrubber_control_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_holo.png Binary files differdeleted file mode 100644 index 45060cb..0000000 --- a/core/res/res/drawable-xhdpi/scrubber_control_holo.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png Binary files differnew file mode 100644 index 0000000..727fcf1 --- /dev/null +++ b/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png diff --git a/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png Binary files differindex d1fe115..6d03e42 100644 --- a/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png +++ b/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png diff --git a/core/res/res/drawable/scrubber_control_selector_holo.xml b/core/res/res/drawable/scrubber_control_selector_holo.xml index d146eee..0734da6 100644 --- a/core/res/res/drawable/scrubber_control_selector_holo.xml +++ b/core/res/res/drawable/scrubber_control_selector_holo.xml @@ -15,7 +15,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:state_enabled="true" android:drawable="@android:drawable/scrubber_control_pressed_holo" /> - <item android:state_enabled="true" android:drawable="@android:drawable/scrubber_control_holo" /> - <item android:drawable="@android:drawable/scrubber_control_disabled_holo" /> + <item android:state_enabled="false" android:drawable="@android:drawable/scrubber_control_disabled_holo" /> + <item android:state_pressed="true" android:drawable="@android:drawable/scrubber_control_pressed_holo" /> + <item android:state_selected="true" android:drawable="@android:drawable/scrubber_control_selected_holo" /> + <item android:drawable="@android:drawable/scrubber_control_normal_holo" /> </selector> |