commit d4988442cbdf287e9856c3c00dad662e1ab36d2b
author Alan Viverette <alanv@google.com> Mon Apr 27 09:44:31 2015 -0700
committer Alan Viverette <alanv@google.com> Mon Apr 27 23:20:18 2015 +0000
tree 6e974c3c85828a8c3ff2f1442b39175b4cd07265
parent 169f824bfe0849de2dc2075e88e54d3248aedda7

Point to Material.Settings themes

Bug: 20546201
Change-Id: Ib6d480d12261101c2e240b23163195ff006a41bd

res/values/themes.xml

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 466c6c9..40b6451 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -152,7 +152,7 @@
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
     </style>
 
-    <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.DayNight.DialogWhenLarge">
+    <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
 
@@ -178,7 +178,7 @@
         <item name="preferenceBackgroundColor">@drawable/preference_background</item>
     </style>
 
-    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.DayNight.Dialog.Alert">
+    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
@@ -220,7 +220,7 @@
         <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
     </style>
 
-    <style name="Theme.FingerprintEnroll" parent="@android:style/Theme.Material.Light.NoActionBar">
+    <style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar">
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
     </style>