diff options
| -rw-r--r-- | core/res/res/values/colors_device_defaults.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/colors_material.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/color/qs_detail_empty.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 7 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml index 5518de2d5c24..f33eb6fd2816 100644 --- a/core/res/res/values/colors_device_defaults.xml +++ b/core/res/res/values/colors_device_defaults.xml @@ -26,6 +26,7 @@ <color name="secondary_device_default_settings">@color/secondary_material_settings</color> <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color> + <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color> <color name="accent_device_default_light">@color/accent_material_light</color> <color name="accent_device_default_dark">@color/accent_material_dark</color> diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index 2ac4092a5079..8a6c229bcdd0 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -34,6 +34,7 @@ <color name="secondary_material_settings">@color/material_blue_grey_800</color> <color name="tertiary_material_settings">@color/material_blue_grey_700</color> + <color name="quaternary_material_settings">@color/material_blue_grey_200</color> <color name="accent_material_light">@color/material_deep_teal_500</color> <color name="accent_material_dark">@color/material_deep_teal_200</color> @@ -85,6 +86,7 @@ <color name="material_deep_teal_300">#ff4db6ac</color> <color name="material_deep_teal_500">#ff009688</color> + <color name="material_blue_grey_200">#ffb0bec5</color> <color name="material_blue_grey_700">#ff455a64</color> <color name="material_blue_grey_800">#ff37474f</color> <color name="material_blue_grey_900">#ff263238</color> diff --git a/packages/SystemUI/res/color/qs_detail_empty.xml b/packages/SystemUI/res/color/qs_detail_empty.xml new file mode 100644 index 000000000000..4be39c7ca6e0 --- /dev/null +++ b/packages/SystemUI/res/color/qs_detail_empty.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:alpha="0.14" android:color="@*android:color/quaternary_device_default_settings" /> +</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index d12ef42590dc..9061376a3279 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -34,8 +34,7 @@ <color name="qs_text">#FFFFFFFF</color> <color name="qs_tile_divider">#29ffffff</color><!-- 16% white --> <color name="qs_subhead">#99FFFFFF</color><!-- 60% white --> - <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200 --> - <color name="qs_detail_button">#FFB0BEC5</color><!-- 100% blue grey 200 --> + <color name="qs_detail_button">@*android:color/quaternary_device_default_settings</color> <color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white --> <color name="qs_detail_transition">#66FFFFFF</color> <color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white --> @@ -122,7 +121,7 @@ <color name="segmented_buttons_background">#14FFFFFF</color><!-- 8% white --> <color name="segmented_button_selected">#FFFFFFFF</color> - <color name="segmented_button_unselected">#FFB0BEC5</color><!-- blue grey 200 --> + <color name="segmented_button_unselected">@*android:color/quaternary_device_default_settings</color> <color name="dark_mode_icon_color_single_tone">#99000000</color> <color name="dark_mode_icon_color_dual_tone_background">#3d000000</color> @@ -134,7 +133,7 @@ <color name="volume_icon_color">#ffffffff</color> <color name="volume_settings_icon_color">#7fffffff</color> - <color name="volume_slider_inactive">#FFB0BEC5</color><!-- blue grey 200 --> + <color name="volume_slider_inactive">@*android:color/quaternary_device_default_settings</color> <color name="docked_divider_background">#ff000000</color> <color name="docked_divider_handle">#ffffff</color> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index a10498b7a481..4edeb4cb3ca3 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -293,7 +293,7 @@ <style name="TextAppearance.Volume.ZenDetail"> <item name="android:textSize">14sp</item> <item name="android:fontFamily">sans-serif</item> - <item name="android:textColor">#ffb0b3c5</item> + <item name="android:textColor">@*android:color/quaternary_device_default_settings</item> </style> <style name="VolumeButtons" parent="@android:style/Widget.Material.Button.Borderless"> |