Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2333912c: Restore checkbox checked color to colorControlActivated

Browse Source 
* commit '2333912c6e4d51995a3fd01286c21c4d0328eb1a':
  Restore checkbox checked color to colorControlActivated
This commit is contained in:
Alan Viverette
2015-04-29 16:58:00 +00:00
committed by Android Git Automerger
parent 91b5e32824 2333912c6e
commit d2d8f27ab9
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/res/res/drawable/btn_check_material_anim.xml
View File

@@ -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>

2
core/res/res/drawable/ic_checkbox_checked.xml
View 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"