New colors for documentsui.
Test: New attributes, no functionality change.
Bug: 28119671
Change-Id: I11bba5a2c380a8b94a16a623519306a94cf512d7
(cherry picked from commit 32bc647c27e437ef44c2cad3ef2cd119e00f5e6f)
diff --git a/res/color/item_details.xml b/res/color/item_details.xml
index ef10ccf..2915eaa 100644
--- a/res/color/item_details.xml
+++ b/res/color/item_details.xml
@@ -17,5 +17,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_enabled="true"
- android:color="@*android:color/secondary_text_default_material_light" />
+ android:color="@color/item_doc_details" />
</selector>
diff --git a/res/color/item_doc_grid_tint.xml b/res/color/item_doc_grid_tint.xml
index 7493d84..23392ca 100644
--- a/res/color/item_doc_grid_tint.xml
+++ b/res/color/item_doc_grid_tint.xml
@@ -17,8 +17,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
- android:color="?android:attr/colorAccent"
- android:alpha=".5" />
+ android:color="@color/item_grid_tint"
+ android:alpha=".15" />
<item
android:color="@android:color/transparent" />
</selector>
diff --git a/res/color/item_eject_icon.xml b/res/color/item_eject_icon.xml
index 15e7e8e..ea545a3 100644
--- a/res/color/item_eject_icon.xml
+++ b/res/color/item_eject_icon.xml
@@ -15,6 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <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:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@color/root_icon_color" />
+ <item android:color="@color/root_icon_color" />
</selector>
diff --git a/res/color/item_root_icon.xml b/res/color/item_root_icon.xml
index e1d7e61..8055e04 100644
--- a/res/color/item_root_icon.xml
+++ b/res/color/item_root_icon.xml
@@ -17,7 +17,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="false"
- android:color="@*android:color/secondary_text_material_light" />
+ android:color="@color/root_icon_color" />
<item
android:state_activated="true"
android:color="@color/root_activated_color" />
diff --git a/res/color/item_root_primary_text.xml b/res/color/item_root_primary_text.xml
index a5a65b2..4313b8c 100644
--- a/res/color/item_root_primary_text.xml
+++ b/res/color/item_root_primary_text.xml
@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<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" />
+ <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@color/root_title_color" />
+ <item android:color="@color/root_title_color" />
</selector>
diff --git a/res/values-sw720dp/colors.xml b/res/values-sw720dp/colors.xml
index 3ecafe2..b39b894 100644
--- a/res/values-sw720dp/colors.xml
+++ b/res/values-sw720dp/colors.xml
@@ -15,5 +15,5 @@
-->
<resources>
- <color name="menu_search_background">#ff676f74</color>
+ <color name="menu_search_background">#ff2852ab</color>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3f5e725..2f35429 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -23,24 +23,30 @@
<color name="directory_background">#fff7f7f7</color>
<color name="menu_search_background">@android:color/transparent</color>
- <color name="primary_dark">@*android:color/primary_dark_device_default_settings</color>
- <color name="primary">@*android:color/primary_device_default_settings</color>
- <color name="accent">@*android:color/accent_device_default_light</color>
+ <color name="primary_dark">#ff254FAE</color>
+ <color name="primary">#ff3367D6</color>
+ <color name="accent">#ff3367D6</color>
<color name="accent_dark">@*android:color/accent_device_default_dark</color>
<color name="band_select_background">#88ffffff</color>
<color name="band_select_border">#44000000</color>
- <color name="root_activated_color">@*android:color/accent_device_default_700</color>
+ <color name="root_title_color">#ff5a5a5a</color>
+ <color name="root_activated_color">#ff3367D6</color>
+
+ <color name="root_icon_color">#ff5a5a5a</color>
+ <color name="doc_icon_color">#ff5a5a5a</color>
<!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->
- <color name="item_doc_title">@*android:color/primary_text_default_material_light</color>
+ <color name="item_doc_title">#ff333333</color>
+ <color name="item_doc_details">#ff333333</color>
<color name="item_doc_background">@*android:color/white</color>
<color name="item_doc_background_disabled">#fff4f4f4</color>
- <color name="item_doc_background_selected">@*android:color/accent_device_default_50</color>
+ <color name="item_doc_background_selected">#4d3367d6</color>
<color name="item_breadcrumb_background_hovered">#1affffff</color>
<color name="item_doc_droppable_background">#ffe8f0fb</color>
<color name="item_doc_not_droppable_background">#ffe0e0e0</color>
+ <color name="item_grid_tint">#3367d6</color>
<color name="item_drag_shadow_background">@*android:color/white</color>