| commit | 218148f1ffb574282bdc72a1a4cc97b7129cf043 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Fri Sep 16 14:47:54 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 16 14:47:54 2011 -0700 |
| tree | 3eef28ff3099e894841d506c09d116ed52ad89d4 | |
| parent | 5855c0ca68de7103e59e4a6e6996fba528cabd9a [diff] | |
| parent | 783ed0d647087f751f24dea16a6d6fd280460380 [diff] |
Merge "Revert "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 e0f55bf..a231195 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 deleted file mode 100644 index 7b264f1..0000000 --- a/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png +++ /dev/null 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 new file mode 100644 index 0000000..fae05e5 --- /dev/null +++ b/core/res/res/drawable-hdpi/scrubber_control_holo.png 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 deleted file mode 100644 index c3a5f7d..0000000 --- a/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png +++ /dev/null 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 6fa4e00..ff4d710 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 a035f6f..9d7b77c 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 deleted file mode 100644 index 5c9720f..0000000 --- a/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png +++ /dev/null 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 new file mode 100644 index 0000000..832fa07 --- /dev/null +++ b/core/res/res/drawable-mdpi/scrubber_control_holo.png 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 deleted file mode 100644 index 2497716..0000000 --- a/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png +++ /dev/null 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 5fc3ca2..4a518f2 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 d70151a..0b0bf24 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 deleted file mode 100644 index 017688f..0000000 --- a/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png +++ /dev/null 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 new file mode 100644 index 0000000..45060cb --- /dev/null +++ b/core/res/res/drawable-xhdpi/scrubber_control_holo.png 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 deleted file mode 100644 index 727fcf1..0000000 --- a/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png +++ /dev/null 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 6d03e42..d1fe115 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 0734da6..d146eee 100644 --- a/core/res/res/drawable/scrubber_control_selector_holo.xml +++ b/core/res/res/drawable/scrubber_control_selector_holo.xml
@@ -15,8 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <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" /> + <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" /> </selector>
