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

Merge "Fix drawer selection to match Material spec." into mnc-dev

Browse Source
This commit is contained in:
Ben Kwa
2015-06-05 00:51:53 +00:00
committed by Android (Google) Code Review
parent e074831605 50698068c1
commit 8dbb43289c
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/DocumentsUI/res/color/item_root_icon.xml
View File

@@ -15,7 +15,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_activated="true" android:color="@*android:color/primary_text_default_material_dark" />
<item android:state_focused="false" android:state_activated="true" android:color="@*android:color/primary_text_default_material_dark" />
<item android:color="@*android:color/secondary_text_material_light" /> <item android:color="@*android:color/secondary_text_material_light" />
</selector> </selector>

4
packages/DocumentsUI/res/color/item_root_primary_text.xml
View File

@@ -15,8 +15,8 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_activated="true" android:color="@*android:color/primary_text_default_material_dark" /> <item android:state_focused="true" android:state_activated="true" android:color="?android:colorAccent" />
<item android:state_focused="false" android:state_activated="true" android:color="@*android:color/primary_text_default_material_dark" /> <item android:state_focused="false" android:state_activated="true" android:color="?android:colorAccent" />
<item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@*android:color/primary_text_default_material_light" /> <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@*android:color/primary_text_default_material_light" />
<item android:color="@*android:color/primary_text_default_material_light" /> <item android:color="@*android:color/primary_text_default_material_light" />
</selector> </selector>

4
packages/DocumentsUI/res/drawable/item_root_background.xml
View File

@@ -16,10 +16,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_activated="true"> <item android:state_focused="true" android:state_activated="true">
<color android:color="?android:attr/colorAccent" /> <color android:color="@color/material_grey_300" />
</item> </item>
<item android:state_focused="false" android:state_activated="true"> <item android:state_focused="false" android:state_activated="true">
<color android:color="?android:attr/colorAccent" /> <color android:color="@color/material_grey_300" />
</item> </item>
<item android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" />
</selector> </selector>