From 2dd296f288fc7303c43860dbf0b6e923754c6cb2 Mon Sep 17 00:00:00 2001
From: Yoshinori Hirano <yoshinori.hirano@sonymobile.com>
Date: Mon, 22 May 2017 17:34:54 +0900
Subject: Change brightness dialog theme

Added new theme Theme.DeviceDefault.QuickSettings.Dialog and applied it
to the brightness dialog.

Fixes: 62010126
Test: visual

Change-Id: I3bc1116a227d5e62d8624c9a4911771152f3ced0
---
 core/res/res/values/themes_device_defaults.xml | 8 ++++++++
 packages/SystemUI/AndroidManifest.xml          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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"
-- 
cgit v1.2.3-59-g8ed1b