diff options
| author | Alan Viverette <alanv@google.com> | 2015-04-29 16:58:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 16:58:00 +0000 |
| commit | d2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde (patch) | |
| tree | bc11672c8c0994e88aa7289bc0b3de1b2d469af9 /core/res | |
| parent | 91b5e32824ae93666a129ca43f9a434328d82f5b (diff) | |
| parent | 2333912c6e4d51995a3fd01286c21c4d0328eb1a (diff) | |
| download | frameworks_base-d2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde.zip frameworks_base-d2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde.tar.gz frameworks_base-d2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde.tar.bz2 | |
am 2333912c: Restore checkbox checked color to colorControlActivated
* commit '2333912c6e4d51995a3fd01286c21c4d0328eb1a':
Restore checkbox checked color to colorControlActivated
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" |