Merge "Style/color fixes to match UX spec." into nyc-andromeda-dev
diff --git a/res/color/item_details.xml b/res/color/item_details.xml
index ac21fe3..ef10ccf 100644
--- a/res/color/item_details.xml
+++ b/res/color/item_details.xml
@@ -17,6 +17,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_enabled="true"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.54" />
+ android:color="@*android:color/secondary_text_default_material_light" />
</selector>
diff --git a/res/color/item_title.xml b/res/color/item_title.xml
index 9fff2f1..82ffb3b 100644
--- a/res/color/item_title.xml
+++ b/res/color/item_title.xml
@@ -17,10 +17,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_enabled="true"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.87" />
+ android:color="?android:attr/textColorPrimary" />
<item
android:state_enabled="false"
- android:color="?android:attr/textColorPrimary"
- android:alpha="0.54" />
+ android:color="@*android:color/secondary_text_default_material_light"/>
</selector>
diff --git a/res/layout/item_subdir.xml b/res/layout/item_subdir.xml
index ffe4afe..18a6f41 100644
--- a/res/layout/item_subdir.xml
+++ b/res/layout/item_subdir.xml
@@ -33,6 +33,6 @@
android:ellipsize="end"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="@*android:color/primary_text_default_material_light" />
</LinearLayout>
diff --git a/res/layout/item_subdir_title.xml b/res/layout/item_subdir_title.xml
index 8d0d807..51f67a4 100644
--- a/res/layout/item_subdir_title.xml
+++ b/res/layout/item_subdir_title.xml
@@ -30,5 +30,5 @@
android:textAlignment="viewStart"
android:drawablePadding="12dp"
android:drawableRight="@drawable/ic_breadcrumb_arrow_down"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
+ android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1353d6f..cb4b04c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,7 +24,7 @@
<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="primary">@*android:color/primary_text_default_material_light</color>
<color name="accent">@*android:color/accent_device_default_light</color>
<color name="accent_dark">@*android:color/accent_device_default_dark</color>
@@ -34,7 +34,7 @@
<color name="root_activated_color">@*android:color/accent_device_default_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">#ffffffff</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_breadcrumb_background_hovered">#1affffff</color>