diff options
| author | 2015-06-05 00:51:53 +0000 | |
|---|---|---|
| committer | 2015-06-05 00:51:54 +0000 | |
| commit | 8dbb43289ccc6bf85399eb3737be0dd5f01de923 (patch) | |
| tree | a5ac25f2f0c81039e27c434fa38b3c17512ec0bf | |
| parent | e0748316053fe0210cf08be002d00a04e6068fb8 (diff) | |
| parent | 50698068c10ad4180930509c2979230b18664bec (diff) | |
Merge "Fix drawer selection to match Material spec." into mnc-dev
| -rw-r--r-- | packages/DocumentsUI/res/color/item_root_icon.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/color/item_root_primary_text.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/drawable/item_root_background.xml | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/packages/DocumentsUI/res/color/item_root_icon.xml b/packages/DocumentsUI/res/color/item_root_icon.xml index 1374e6195f83..0aa2c1341db4 100644 --- a/packages/DocumentsUI/res/color/item_root_icon.xml +++ b/packages/DocumentsUI/res/color/item_root_icon.xml @@ -15,7 +15,5 @@ --> <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" /> </selector> diff --git a/packages/DocumentsUI/res/color/item_root_primary_text.xml b/packages/DocumentsUI/res/color/item_root_primary_text.xml index 7e703fac992c..551245fcbc64 100644 --- a/packages/DocumentsUI/res/color/item_root_primary_text.xml +++ b/packages/DocumentsUI/res/color/item_root_primary_text.xml @@ -15,8 +15,8 @@ --> <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:state_focused="true" android:state_activated="true" android:color="?android:colorAccent" /> + <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:color="@*android:color/primary_text_default_material_light" /> </selector> diff --git a/packages/DocumentsUI/res/drawable/item_root_background.xml b/packages/DocumentsUI/res/drawable/item_root_background.xml index 1b3f44aca159..93c965f7b906 100644 --- a/packages/DocumentsUI/res/drawable/item_root_background.xml +++ b/packages/DocumentsUI/res/drawable/item_root_background.xml @@ -16,10 +16,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true" android:state_activated="true"> - <color android:color="?android:attr/colorAccent" /> + <color android:color="@color/material_grey_300" /> </item> <item android:state_focused="false" android:state_activated="true"> - <color android:color="?android:attr/colorAccent" /> + <color android:color="@color/material_grey_300" /> </item> <item android:drawable="@android:color/transparent" /> </selector> |