From b84b3e6d773ff2f2ef615f890e4bdea344aeb832 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Sun, 12 Jun 2016 14:41:35 -0700
Subject: [PATCH] Add some themes to let Settings use DeviceDefault.

There were a couple of material themes without the equivalent
DeviceDefault variants.

Also added a new theme overlay that styles something like the
dark action bar but also overrides the accent color.

BUG: 28625050
Change-Id: I2c119a22cb99169a0fed293046fba25d516c7e73
---
 core/res/res/values/themes_device_defaults.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 273d93f61b32d..9369456bc5c26 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -733,6 +733,20 @@ easier.
         <item name="colorAccent">@color/accent_device_default_light</item>
     </style>
 
+    <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="Theme.Material.Settings.DialogWhenLarge">
+        <!-- Color palette -->
+        <item name="colorPrimary">@color/primary_device_default_settings</item>
+        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
+        <item name="colorAccent">@color/accent_device_default_light</item>
+    </style>
+
+    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.Alert">
+        <!-- Color palette -->
+        <item name="colorPrimary">@color/primary_device_default_settings</item>
+        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
+        <item name="colorAccent">@color/accent_device_default_light</item>
+    </style>
+
     <!-- Theme used for the intent picker activity. -->
     <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">
         <item name="windowIsTranslucent">true</item>
@@ -764,4 +778,8 @@ easier.
         <item name="colorAccent">@color/accent_device_default_light</item>
     </style>
 
+    <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="ThemeOverlay.Material.Dark.ActionBar">
+        <item name="colorAccent">@color/accent_device_default_dark</item>
+    </style>
+
 </resources>