summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ng <petergng@google.com>2011-08-31 14:28:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-31 14:28:23 -0700
commit9c1b694df422bf7204628fe44ddc4988a607015d (patch)
tree700ee6135b71905e1f35864b3f2996ba6b1857c7
parent1434ab98e690cbcfcdcd2296b491a44bff14cc55 (diff)
parent6cb074156ea0d2f74d2d1302104410ac2eb659f7 (diff)
downloadframeworks_base-9c1b694df422bf7204628fe44ddc4988a607015d.zip
frameworks_base-9c1b694df422bf7204628fe44ddc4988a607015d.tar.gz
frameworks_base-9c1b694df422bf7204628fe44ddc4988a607015d.tar.bz2
Merge "Switches now have checked state"
-rw-r--r--core/res/res/drawable/switch_inner_holo_dark.xml1
-rw-r--r--core/res/res/drawable/switch_inner_holo_light.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/drawable/switch_inner_holo_dark.xml b/core/res/res/drawable/switch_inner_holo_dark.xml
index 3eb55ee..67584bc 100644
--- a/core/res/res/drawable/switch_inner_holo_dark.xml
+++ b/core/res/res/drawable/switch_inner_holo_dark.xml
@@ -17,5 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_dark" />
<item android:state_pressed="true" android:drawable="@drawable/switch_thumb_pressed_holo_dark" />
+ <item android:state_checked="true" android:drawable="@drawable/switch_thumb_activated_holo_dark" />
<item android:drawable="@drawable/switch_thumb_holo_dark" />
</selector>
diff --git a/core/res/res/drawable/switch_inner_holo_light.xml b/core/res/res/drawable/switch_inner_holo_light.xml
index 9b287cf..95df0e88 100644
--- a/core/res/res/drawable/switch_inner_holo_light.xml
+++ b/core/res/res/drawable/switch_inner_holo_light.xml
@@ -17,5 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_light" />
<item android:state_pressed="true" android:drawable="@drawable/switch_thumb_pressed_holo_light" />
+ <item android:state_checked="true" android:drawable="@drawable/switch_thumb_activated_holo_light" />
<item android:drawable="@drawable/switch_thumb_holo_light" />
</selector>