summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mill Chen <millchen@google.com> 2019-05-08 18:50:05 +0800
committer Mill Chen <millchen@google.com> 2019-05-20 19:51:11 +0800
commit28e8f9f365a18a782588e15901360f1023017fd9 (patch)
tree116432e51057033f219c1970e2fd62ed11cfa455
parent94b2981853f47de2e38494a0e78ef0af3ba39354 (diff)
Add 2 attributes for list_divider_material
We added two attributes for list divider, one gets set up the color of list divider and the other gets set up the opacity of its color. This approach facilitates updating the color of the list divider for device default themes. Bug: 129943610 Test: visual Change-Id: Ia319a31e223a86d71720e2dab63dce200ca824df
-rw-r--r--core/res/res/drawable/list_divider_material.xml4
-rw-r--r--core/res/res/values-night/themes_device_defaults.xml3
-rw-r--r--core/res/res/values/attrs.xml4
-rw-r--r--core/res/res/values/colors_device_defaults.xml2
-rw-r--r--core/res/res/values/colors_material.xml3
-rw-r--r--core/res/res/values/themes_device_defaults.xml3
-rw-r--r--core/res/res/values/themes_material.xml4
7 files changed, 19 insertions, 4 deletions
diff --git a/core/res/res/drawable/list_divider_material.xml b/core/res/res/drawable/list_divider_material.xml
index 658a59d57330..e4c12fb1ad4e 100644
--- a/core/res/res/drawable/list_divider_material.xml
+++ b/core/res/res/drawable/list_divider_material.xml
@@ -15,8 +15,8 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?attr/colorForeground">
- <solid android:color="#1f000000" />
+ android:tint="?attr/colorListDivider">
+ <solid android:color="?attr/opacityListDivider" />
<size
android:height="1dp"
android:width="1dp" />
diff --git a/core/res/res/values-night/themes_device_defaults.xml b/core/res/res/values-night/themes_device_defaults.xml
index b8bc17f2a232..051f7a03176f 100644
--- a/core/res/res/values-night/themes_device_defaults.xml
+++ b/core/res/res/values-night/themes_device_defaults.xml
@@ -59,7 +59,8 @@ easier.
<item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
<item name="colorBackground">@color/primary_dark_device_default_settings</item>
- <item name="listDivider">@color/list_divider_color_dark</item>
+ <item name="colorListDivider">@color/list_divider_color_dark</item>
+ <item name="opacityListDivider">@color/list_divider_opacity_device_default_dark</item>
</style>
<style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.BaseDialog">
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index dbde79b74d4f..81accdf82b00 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -89,6 +89,10 @@
<attr name="backgroundDimEnabled" format="boolean" />
<!-- Color of background imagery used for popup windows. -->
<attr name="colorPopupBackground" format="color" />
+ <!-- Color used for list divider. -->
+ <attr name="colorListDivider" format="color" />
+ <!-- Opacity used for list divider. -->
+ <attr name="opacityListDivider" format="color" />
<!-- =========== -->
<!-- Text styles -->
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml
index 112f98e5ef35..c60b3996beb5 100644
--- a/core/res/res/values/colors_device_defaults.xml
+++ b/core/res/res/values/colors_device_defaults.xml
@@ -48,6 +48,8 @@
<color name="list_divider_color_light">#ffdadce0</color>
<color name="list_divider_color_dark">#85ffffff</color>
+ <color name="list_divider_opacity_device_default_light">@android:color/white</color>
+ <color name="list_divider_opacity_device_default_dark">@android:color/white</color>
<color name="loading_gradient_background_color_dark">#2D3033</color>
<color name="loading_gradient_background_color_light">#DADCE0</color>
<color name="loading_gradient_highlight_color_dark">#3C4043</color>
diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml
index 2966aff6a9da..d357f0102777 100644
--- a/core/res/res/values/colors_material.xml
+++ b/core/res/res/values/colors_material.xml
@@ -149,4 +149,7 @@
<color name="autofill_background_material_dark">@color/material_blue_grey_900</color>
<color name="autofill_background_material_light">@color/material_grey_50</color>
+ <!-- List divider opacity -->
+ <color name="list_divider_opacity_material">#1f000000</color>
+
</resources>
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 8015a5d5fbdd..2b9321c7afff 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -1488,7 +1488,8 @@ easier.
<!-- Progress bar attributes -->
<item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>
- <item name="listDivider">@color/list_divider_color_light</item>
+ <item name="colorListDivider">@color/list_divider_color_light</item>
+ <item name="opacityListDivider">@color/list_divider_opacity_device_default_light</item>
</style>
<!-- @hide DeviceDefault theme for a window that should use Settings theme colors
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 6337db1905c9..ce2938952d61 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -53,6 +53,8 @@ please see themes_device_defaults.xml.
<item name="backgroundDimAmount">0.6</item>
<item name="colorError">@color/error_color_material_dark</item>
<item name="colorPopupBackground">?attr/colorBackground</item>
+ <item name="colorListDivider">?attr/colorForeground</item>
+ <item name="opacityListDivider">@color/list_divider_opacity_material</item>
<!-- Text styles -->
<item name="textAppearance">@style/TextAppearance.Material</item>
@@ -424,6 +426,8 @@ please see themes_device_defaults.xml.
<item name="backgroundDimAmount">0.6</item>
<item name="colorError">@color/error_color_material_light</item>
<item name="colorPopupBackground">?attr/colorBackground</item>
+ <item name="colorListDivider">?attr/colorForeground</item>
+ <item name="opacityListDivider">@color/list_divider_opacity_material</item>
<!-- Text styles -->
<item name="textAppearance">@style/TextAppearance.Material</item>