diff options
| author | Ben Kwa <kenobi@google.com> | 2015-06-04 09:10:05 -0700 |
|---|---|---|
| committer | Ben Kwa <kenobi@google.com> | 2015-06-04 16:28:16 -0700 |
| commit | 50698068c10ad4180930509c2979230b18664bec (patch) | |
| tree | e95b2576b0c32069b0c263ccfb768a72b000a48e | |
| parent | 327c364113c18c9d5a05df0c912b65788461da41 (diff) | |
| download | frameworks_base-50698068c10ad4180930509c2979230b18664bec.zip frameworks_base-50698068c10ad4180930509c2979230b18664bec.tar.gz frameworks_base-50698068c10ad4180930509c2979230b18664bec.tar.bz2 | |
Fix drawer selection to match Material spec.
- highlighted text changed to match the application primary color
- change highlighted background to light gray
- remove highlight icon tinting (provides insufficient contrast against
the new light gray background)
BUG=18685226
Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
| -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 1374e61..0aa2c13 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 7e703fa..551245f 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 1b3f44a..93c965f 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> |