diff options
| author | Alan Viverette <alanv@google.com> | 2014-07-25 00:15:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 22:06:48 +0000 |
| commit | 366c693b60c5c2943e77de1e33217c1efc31d12e (patch) | |
| tree | 05a43c38d3b07b30990d3518527e09bbabe2728b | |
| parent | f0452adb4354e0d6e58b1894cc46357b39c831a8 (diff) | |
| parent | c734dafb2107bd91c7daa61a274735ef97871e86 (diff) | |
| download | frameworks_base-366c693b60c5c2943e77de1e33217c1efc31d12e.zip frameworks_base-366c693b60c5c2943e77de1e33217c1efc31d12e.tar.gz frameworks_base-366c693b60c5c2943e77de1e33217c1efc31d12e.tar.bz2 | |
Merge "Fix radio button tints" into lmp-dev
| -rw-r--r-- | core/res/res/drawable/btn_radio_material_anim.xml | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/core/res/res/drawable/btn_radio_material_anim.xml b/core/res/res/drawable/btn_radio_material_anim.xml index 0be590e..121e544 100644 --- a/core/res/res/drawable/btn_radio_material_anim.xml +++ b/core/res/res/drawable/btn_radio_material_anim.xml @@ -16,42 +16,52 @@ <animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" android:state_checked="true"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_015" android:tint="?attr/colorControlActivated" android:alpha="?attr/disabledAlpha" /> + <bitmap + android:src="@drawable/btn_radio_to_on_mtrl_015" + android:tint="?attr/colorControlActivated" + android:alpha="?attr/disabledAlpha" /> </item> <item android:state_enabled="false"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" android:alpha="?attr/disabledAlpha" /> + <bitmap + android:src="@drawable/btn_radio_to_on_mtrl_000" + android:tint="?attr/colorControlNormal" + android:alpha="?attr/disabledAlpha" /> </item> <item android:state_checked="true" android:id="@+id/on"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_015" android:tint="?attr/colorControlActivated" /> + <bitmap + android:src="@drawable/btn_radio_to_on_mtrl_015" + android:tint="?attr/colorControlActivated" /> </item> <item android:id="@+id/off"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" /> + <bitmap + android:src="@drawable/btn_radio_to_on_mtrl_000" + android:tint="?attr/colorControlNormal" /> </item> <transition android:fromId="@+id/off" android:toId="@+id/on"> <animation-list> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_001" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_001" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_002" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_002" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_003" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_003" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_004" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_004" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_005" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_005" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_006" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_006" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_on_mtrl_007" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_on_mtrl_007" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> <bitmap android:src="@drawable/btn_radio_to_on_mtrl_008" android:tint="?attr/colorControlActivated" /> @@ -106,28 +116,28 @@ <bitmap android:src="@drawable/btn_radio_to_off_mtrl_007" android:tint="?attr/colorControlActivated" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_008" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_008" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_009" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_009" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_010" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_010" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_011" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_011" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_012" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_012" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_013" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_013" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_014" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_014" android:tint="?attr/colorControlNormal" /> </item> <item android:duration="15"> - <bitmap android:src="@drawable/btn_radio_to_off_mtrl_015" android:tint="?attr/colorControlActivated" /> + <bitmap android:src="@drawable/btn_radio_to_off_mtrl_015" android:tint="?attr/colorControlNormal" /> </item> </animation-list> </transition> |