diff options
| author | 2017-05-30 16:46:12 +0000 | |
|---|---|---|
| committer | 2017-05-30 16:46:18 +0000 | |
| commit | 3b5934b2676e7cad516f78c0dce4f1da66c828f2 (patch) | |
| tree | a34f2a21779ffc441516ade482655ad3c9d06324 | |
| parent | 8bc45cb78fafcd6165004addf9d8c538ee91b936 (diff) | |
| parent | 2dd296f288fc7303c43860dbf0b6e923754c6cb2 (diff) | |
Merge "Change brightness dialog theme" into oc-dev
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 8 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 75179463f0c4..8755e37f105f 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -758,6 +758,14 @@ easier. <item name="colorControlNormal">?attr/textColorPrimary</item> </style> + <style name="Theme.DeviceDefault.QuickSettings.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> + <item name="colorSecondary">@color/secondary_device_default_settings_light</item> + <item name="colorAccent">@color/accent_device_default_light</item> + </style> + <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar --> <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.Material.NoActionBar"> <!-- Color palette --> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 79b02a5286e0..c4e134b92ec7 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -531,7 +531,7 @@ <activity android:name=".settings.BrightnessDialog" android:label="@string/quick_settings_brightness_dialog_title" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" + android:theme="@*android:style/Theme.DeviceDefault.QuickSettings.Dialog" android:finishOnCloseSystemDialogs="true" android:launchMode="singleInstance" android:excludeFromRecents="true" |