diff options
| -rw-r--r-- | core/res/res/values-night/values.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/core/res/res/values-night/values.xml b/core/res/res/values-night/values.xml index 3fd82b874a84..1571fab66a5b 100644 --- a/core/res/res/values-night/values.xml +++ b/core/res/res/values-night/values.xml @@ -16,7 +16,7 @@ --> <resources> - <style name="Theme.DeviceDefault.QuickSettings" parent="android:Theme.DeviceDefault"> + <style name="Theme.DeviceDefault.SystemUI" parent="android:Theme.DeviceDefault"> <!-- Color palette --> <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item> <item name="colorSecondary">@color/secondary_device_default_settings</item> @@ -27,5 +27,5 @@ <item name="forceDarkAllowed">false</item> </style> - <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Dialog" /> + <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Dialog" /> </resources>
\ No newline at end of file diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 92d857d07353..ba9e4543abb3 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3569,7 +3569,7 @@ <java-symbol type="bool" name="config_quickSettingsSupported" /> - <java-symbol type="style" name="Theme.DeviceDefault.QuickSettings" /> + <java-symbol type="style" name="Theme.DeviceDefault.SystemUI" /> <java-symbol type="integer" name="default_data_warning_level_mb" /> <java-symbol type="bool" name="config_useVideoPauseWorkaround" /> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index e40e31e582db..ca4265a90fc3 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -1884,9 +1884,7 @@ easier. <item name="opacityListDivider">@color/list_divider_opacity_device_default_light</item> </style> - <!-- @hide DeviceDefault theme for a window that should use Settings theme colors - but has a full dark palette. ONLY USED FOR QUICK SETTINGS THEME --> - <style name="Theme.DeviceDefault.QuickSettings" parent="Theme.DeviceDefault.Light"> + <style name="Theme.DeviceDefault.SystemUI" parent="Theme.DeviceDefault.Light"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_settings_light</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item> @@ -1914,7 +1912,7 @@ easier. <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> </style> - <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Light.Dialog"> + <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Light.Dialog"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_settings_light</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index c9bd370cd49c..42d7e587b668 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -679,7 +679,7 @@ <activity android:name=".settings.brightness.BrightnessDialog" android:label="@string/quick_settings_brightness_dialog_title" - android:theme="@*android:style/Theme.DeviceDefault.QuickSettings.Dialog" + android:theme="@*android:style/Theme.DeviceDefault.SystemUI.Dialog" android:finishOnCloseSystemDialogs="true" android:launchMode="singleInstance" android:excludeFromRecents="true" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 0eb4d08d7421..0620a5b7e162 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -316,7 +316,7 @@ <style name="Animation.StatusBar"> </style> - <style name="Theme.SystemUI" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> + <style name="Theme.SystemUI" parent="@*android:style/Theme.DeviceDefault.SystemUI"> <item name="lightIconTheme">@style/DualToneLightTheme</item> <item name="darkIconTheme">@style/DualToneDarkTheme</item> <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> @@ -375,7 +375,7 @@ <item name="*android:dotColor">?android:attr/textColorSecondary</item> </style> - <style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> + <style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.SystemUI"> <item name="lightIconTheme">@style/QSIconTheme</item> <item name="darkIconTheme">@style/QSIconTheme</item> <item name="android:colorError">@*android:color/error_color_material_dark</item> |