diff options
| author | 2020-12-02 16:02:31 +0000 | |
|---|---|---|
| committer | 2020-12-02 16:02:31 +0000 | |
| commit | 68a3422b492234ca3a89c6606685d3641fd849d9 (patch) | |
| tree | 8f2bc50c5aaae11a428d3ccaa023e192ca0ba4ea | |
| parent | 5bcadd3ccd75d34c7abf4eaac3b324f9e5e451dc (diff) | |
| parent | 6cb5348db5f763c8a3d0fccbd8c2a74679a9bc3e (diff) | |
Merge "5/N The road to Material NEXT (background color)"
| -rw-r--r-- | core/res/res/values-night/values.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/core/res/res/values-night/values.xml b/core/res/res/values-night/values.xml index 4e6b712f1f5d..952cdd08451c 100644 --- a/core/res/res/values-night/values.xml +++ b/core/res/res/values-night/values.xml @@ -25,18 +25,12 @@ <item name="colorControlNormal">?attr/textColorPrimary</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item> <item name="forceDarkAllowed">false</item> - - <!-- QS panel background --> - <item name="colorBackgroundFloating">@color/black</item> - - <!-- volume background --> - <item name="panelColorBackground">@color/material_grey_800</item> </style> <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Dialog" /> <style name="TextAppearance.Material.Notification"> - <item name="textColor">@color/notification_secondary_text_color_dark</item> + <item name="textColor">?attr/textColorPrimary</item> <item name="textSize">@dimen/notification_text_size</item> </style> </resources>
\ No newline at end of file diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 1afaf4f7f184..c0731c82bff3 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -215,8 +215,10 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> + <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> <item name="colorPopupBackground">?attr/colorBackgroundFloating</item> + <item name="panelColorBackground">?attr/colorBackgroundFloating</item> </style> <style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" /> @@ -943,8 +945,10 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> <item name="colorError">@color/error_color_device_default_light</item> + <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> <item name="colorPopupBackground">?attr/colorBackgroundFloating</item> + <item name="panelColorBackground">?attr/colorBackgroundFloating</item> </style> <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an @@ -1517,9 +1521,6 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - - <!-- volume background --> - <item name="panelColorBackground">@color/primary_material_light</item> </style> <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog"> |