diff options
| author | Justin Ho <justinho@google.com> | 2011-09-18 16:56:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-18 16:56:12 -0700 |
| commit | 31f971b57f526e2688241080b30c7e8df33bf62d (patch) | |
| tree | b9b8608a2a6543d014d41f0c652fde9d1e5c7a56 /core | |
| parent | aaf301736e923db15918617145069658696be453 (diff) | |
| parent | 2357858a1d22d9132155a3272b26a60e3ea967f0 (diff) | |
| download | frameworks_base-31f971b57f526e2688241080b30c7e8df33bf62d.zip frameworks_base-31f971b57f526e2688241080b30c7e8df33bf62d.tar.gz frameworks_base-31f971b57f526e2688241080b30c7e8df33bf62d.tar.bz2 | |
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
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..1e6c668 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_focused_holo" /> + <item android:drawable="@android:drawable/scrubber_control_normal_holo" /> </selector> |
