| commit | 5855c0ca68de7103e59e4a6e6996fba528cabd9a | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Fri Sep 16 14:15:04 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 16 14:15:04 2011 -0700 |
| tree | b62177939992b8b2a7c8030fe7faad9a2e5d4ce1 | |
| parent | a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac [diff] | |
| parent | a11aeeb36560959db321f9757d4c5eccfdfa7f63 [diff] |
Merge "Adding selected state for scrubber control" into ics-factoryrom
diff --git a/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png index 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 Binary files differ
diff --git a/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png new file mode 100644 index 0000000..7b264f1 --- /dev/null +++ b/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/scrubber_control_holo.png b/core/res/res/drawable-hdpi/scrubber_control_holo.png deleted file mode 100644 index fae05e5..0000000 --- a/core/res/res/drawable-hdpi/scrubber_control_holo.png +++ /dev/null Binary files differ
diff --git a/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png new file mode 100644 index 0000000..c3a5f7d --- /dev/null +++ b/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png index 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 Binary files differ
diff --git a/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png index 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 Binary files differ
diff --git a/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png new file mode 100644 index 0000000..5c9720f --- /dev/null +++ b/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/scrubber_control_holo.png b/core/res/res/drawable-mdpi/scrubber_control_holo.png deleted file mode 100644 index 832fa07..0000000 --- a/core/res/res/drawable-mdpi/scrubber_control_holo.png +++ /dev/null Binary files differ
diff --git a/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png new file mode 100644 index 0000000..2497716 --- /dev/null +++ b/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png index 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 Binary files differ
diff --git a/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png index 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 Binary files differ
diff --git a/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png new file mode 100644 index 0000000..017688f --- /dev/null +++ b/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/scrubber_control_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_holo.png deleted file mode 100644 index 45060cb..0000000 --- a/core/res/res/drawable-xhdpi/scrubber_control_holo.png +++ /dev/null Binary files differ
diff --git a/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png new file mode 100644 index 0000000..727fcf1 --- /dev/null +++ b/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png b/core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png index 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 Binary files differ
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>
