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

Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-12-08 22:08:05 +00:00
committed by Android (Google) Code Review
parent c414f4665f 07ac7fbcab
commit 3ba8328825
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/res/res/drawable/spinner_background_material.xml
View File

@@ -16,16 +16,17 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true"> android:autoMirrored="true">
<item android:state_checked="true"> <item android:state_enabled="false">
<nine-patch android:src="@drawable/spinner_mtrl_am_alpha" <nine-patch android:src="@drawable/spinner_mtrl_am_alpha"
android:tint="?attr/colorControlActivated" /> android:tint="?attr/colorControlNormal"
android:alpha="?attr/disabledAlpha" />
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="false" android:state_focused="false">
<nine-patch android:src="@drawable/spinner_mtrl_am_alpha"
android:tint="?attr/colorControlActivated" />
</item>
<item>
<nine-patch android:src="@drawable/spinner_mtrl_am_alpha" <nine-patch android:src="@drawable/spinner_mtrl_am_alpha"
android:tint="?attr/colorControlNormal" /> android:tint="?attr/colorControlNormal" />
</item> </item>
<item>
<nine-patch android:src="@drawable/spinner_mtrl_am_alpha"
android:tint="?attr/colorControlActivated" />
</item>
</selector> </selector>

16
core/res/res/drawable/spinner_textfield_background_material.xml
View File

@@ -17,7 +17,21 @@
<inset xmlns:android="http://schemas.android.com/apk/res/android" <inset xmlns:android="http://schemas.android.com/apk/res/android"
android:inset="@dimen/control_inset_material"> android:inset="@dimen/control_inset_material">
<selector android:autoMirrored="true"> <selector android:autoMirrored="true">
<item android:state_checked="false" android:state_pressed="false"> <item android:state_enabled="false">
<layer-list android:paddingMode="stack">
<item>
<nine-patch android:src="@drawable/textfield_activated_mtrl_alpha"
android:tint="?attr/colorControlActivated"
android:alpha="?attr/disabledAlpha" />
</item>
<item>
<nine-patch android:src="@drawable/spinner_mtrl_am_alpha"
android:tint="?attr/colorControlActivated"
android:alpha="?attr/disabledAlpha" />
</item>
</layer-list>
</item>
<item android:state_pressed="false" android:state_focused="false">
<layer-list android:paddingMode="stack"> <layer-list android:paddingMode="stack">
<item> <item>
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha" <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"