diff options
| author | 2016-03-24 09:37:57 +0000 | |
|---|---|---|
| committer | 2016-03-24 09:37:58 +0000 | |
| commit | 50c8d49d4c3a633347e9c664729f550ef5bb08c0 (patch) | |
| tree | f3fbd09c7645d3bf09de12b299a50905adf4d0f4 | |
| parent | b52a874f3c73a7849f18f52f604b68478db69c00 (diff) | |
| parent | 588d6934d55d88d02d1bb49c743cf777dda14b63 (diff) | |
Merge "Make the activated root color darker in DocumentsUI for better a11y." into nyc-dev
| -rw-r--r-- | packages/DocumentsUI/res/color/item_root_primary_text.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/colors.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/DocumentsUI/res/color/item_root_primary_text.xml b/packages/DocumentsUI/res/color/item_root_primary_text.xml index 551245fcbc64..a5a65b2a0339 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:colorAccent" /> - <item android:state_focused="false" android:state_activated="true" android:color="?android:colorAccent" /> + <item android:state_focused="true" android:state_activated="true" android:color="@color/root_activated_color" /> + <item android:state_focused="false" android:state_activated="true" android:color="@color/root_activated_color" /> <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/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index 04b7feeca827..51e04b6da367 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -16,6 +16,7 @@ <resources> <color name="material_grey_400">#ffbdbdbd</color> + <color name="material_teal_700">#ff00796b</color> <!-- This is the window background, but also the background for anything else that needs to manually declare a background matching the "default" @@ -36,6 +37,8 @@ <color name="item_doc_background_disabled">#fff4f4f4</color> + <color name="root_activated_color">@color/material_teal_700</color> + <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation --> <color name="item_doc_background">#fffafafa</color> <color name="item_doc_background_selected">#ffe0f2f1</color> |