commit f072ef9b5cfd1dde28d71908df1250de039b2841
author Alan Viverette <alanv@google.com> Fri Jun 06 14:15:49 2014 -0700
committer Alan Viverette <alanv@google.com> Fri Jun 06 14:15:49 2014 -0700
tree ca29de018a9681193ae20f7948f829856de45079
parent 54188d12b8d216c4d38390c58dcc5308bbf9696b

DO NOT MERGE Material theme

BUG: 15467097
Change-Id: Ia631731436b4e3b12331f96f62fdb483e6297c41

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5eb68f2..b62026b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -160,7 +160,7 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
 
-    <style name="SettingsLight" parent="android:Theme.Quantum.Light">
+    <style name="SettingsLight" parent="android:Theme.Material.Light">
         <item name="android:windowBackground">@color/phone_settings_background_color</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
@@ -235,7 +235,7 @@
     </style>
 
     <!-- Style for the call settings action bar.  Should be kept in sync with Dialer. -->
-    <style name="DialtactsActionBarStyle" parent="android:Widget.Quantum.ActionBar">
+    <style name="DialtactsActionBarStyle" parent="android:Widget.Material.ActionBar">
         <item name="android:background">@color/actionbar_background_color</item>
         <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
         <item name="android:height">@dimen/action_bar_height</item>