OSDN Git Service

Restore checkbox checked color to colorControlActivated
authorAlan Viverette <alanv@google.com>
Wed, 29 Apr 2015 16:51:35 +0000 (09:51 -0700)
committerAlan Viverette <alanv@google.com>
Wed, 29 Apr 2015 16:51:35 +0000 (09:51 -0700)
Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee

core/res/res/drawable/btn_check_material_anim.xml
core/res/res/drawable/ic_checkbox_checked.xml

index 41caa4e..7cb1b89 100644 (file)
 -->
 
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:id="@+id/on"
+
+    <item
+        android:id="@+id/on"
+        android:state_checked="true"
         android:drawable="@drawable/ic_checkbox_checked" />
-    <item android:id="@+id/off"
+
+    <item
+        android:id="@+id/off"
         android:drawable="@drawable/ic_checkbox_unchecked" />
 
-    <transition android:fromId="@+id/off" android:toId="@+id/on"
+    <transition
+        android:fromId="@+id/off"
+        android:toId="@+id/on"
         android:drawable="@drawable/ic_checkbox_unchecked_animation" />
 
-    <transition android:fromId="@+id/on" android:toId="@+id/off"
+    <transition
+        android:fromId="@+id/on"
+        android:toId="@+id/off"
         android:drawable="@drawable/ic_checkbox_checked_animation" />
-</animated-selector>
 
+</animated-selector>
index 4764115..cc7b5df 100644 (file)
@@ -22,7 +22,7 @@
     android:viewportWidth="48"
     android:height="32dp"
     android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal" >
+    android:tint="?attr/colorControlActivated" >
     <group
         android:name="icon_null"
         android:translateX="24"