From 2333912c6e4d51995a3fd01286c21c4d0328eb1a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 29 Apr 2015 09:51:35 -0700
Subject: [PATCH] Restore checkbox checked color to colorControlActivated

Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
---
 core/res/res/drawable/btn_check_material_anim.xml | 19 ++++++++++++++-----
 core/res/res/drawable/ic_checkbox_checked.xml     |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/res/res/drawable/btn_check_material_anim.xml b/core/res/res/drawable/btn_check_material_anim.xml
index 41caa4ece032..7cb1b89904b6 100644
--- a/core/res/res/drawable/btn_check_material_anim.xml
+++ b/core/res/res/drawable/btn_check_material_anim.xml
@@ -15,15 +15,24 @@
 -->
 
 <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>
diff --git a/core/res/res/drawable/ic_checkbox_checked.xml b/core/res/res/drawable/ic_checkbox_checked.xml
index 476411516dad..cc7b5df6fac4 100644
--- a/core/res/res/drawable/ic_checkbox_checked.xml
+++ b/core/res/res/drawable/ic_checkbox_checked.xml
@@ -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"
-- 
2.11.0