diff options
| author | Ben Kwa <kenobi@google.com> | 2015-06-05 01:04:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 01:04:52 +0000 |
| commit | 7eb2d726e8effc2af6983c78d3d69992c68b9562 (patch) | |
| tree | 37b0835b736dd8a461765dde128ca18cd0a26dd6 /packages/DocumentsUI | |
| parent | acce6dda97e57db562f751bdd5ff72ea058dd970 (diff) | |
| parent | 8dbb43289ccc6bf85399eb3737be0dd5f01de923 (diff) | |
| download | frameworks_base-7eb2d726e8effc2af6983c78d3d69992c68b9562.zip frameworks_base-7eb2d726e8effc2af6983c78d3d69992c68b9562.tar.gz frameworks_base-7eb2d726e8effc2af6983c78d3d69992c68b9562.tar.bz2 | |
am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev
* commit '8dbb43289ccc6bf85399eb3737be0dd5f01de923':
Fix drawer selection to match Material spec.
Diffstat (limited to 'packages/DocumentsUI')
| -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> |