diff options
| author | Alan Viverette <alanv@google.com> | 2015-04-29 09:51:35 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-04-29 09:51:35 -0700 |
| commit | 2333912c6e4d51995a3fd01286c21c4d0328eb1a (patch) | |
| tree | 67815e09b27999d63c5d2706b6bbd63dca77fa42 /core/res | |
| parent | 0e0c9d9392e4b4580939632ca4e74f2073e59290 (diff) | |
| download | frameworks_base-2333912c6e4d51995a3fd01286c21c4d0328eb1a.zip frameworks_base-2333912c6e4d51995a3fd01286c21c4d0328eb1a.tar.gz frameworks_base-2333912c6e4d51995a3fd01286c21c4d0328eb1a.tar.bz2 | |
Restore checkbox checked color to colorControlActivated
Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/drawable/btn_check_material_anim.xml | 19 | ||||
| -rw-r--r-- | 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 41caa4e..7cb1b89 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 4764115..cc7b5df 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" |