Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom

16 files changed, 3 insertions, 4 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
index e0f55bf2d694..a23119511832 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
deleted file mode 100644
index 7b264f147308..000000000000
--- a/core/res/res/drawable-hdpi/scrubber_control_focused_holo.png
+++ /dev/null
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 000000000000..fae05e5dadee
--- /dev/null
+++ b/core/res/res/drawable-hdpi/scrubber_control_holo.png
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 c3a5f7dc2a5c..000000000000
--- a/core/res/res/drawable-hdpi/scrubber_control_normal_holo.png
+++ /dev/null
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 6fa4e00b90b0..ff4d71074122 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
index a035f6f44bca..9d7b77c3d467 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
deleted file mode 100644
index 5c9720fb0593..000000000000
--- a/core/res/res/drawable-mdpi/scrubber_control_focused_holo.png
+++ /dev/null
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 000000000000..832fa07e9bb9
--- /dev/null
+++ b/core/res/res/drawable-mdpi/scrubber_control_holo.png
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 2497716c56e9..000000000000
--- a/core/res/res/drawable-mdpi/scrubber_control_normal_holo.png
+++ /dev/null
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 5fc3ca23974f..4a518f2a086c 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
index d70151af4142..0b0bf244657f 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
deleted file mode 100644
index 017688fb124d..000000000000
--- a/core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png
+++ /dev/null
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 000000000000..45060cbf2780
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/scrubber_control_holo.png
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 727fcf1af8dd..000000000000
--- a/core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png
+++ /dev/null
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 6d03e42ff043..d1fe11591b76 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 0734da626225..d146eee3b8c2 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>