From 0efac4693fe6eb711e3e8f515fc7693f02f1ee07 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Mon, 13 Nov 2017 16:05:29 -0800
Subject: [PATCH] Update Settings to use DeviceDefault colored button

Uses new Widget.DeviceDefault.Button.Colored style.
Also updates some of the styles to use DeviceDefault
instead of Material styles for a bunch of button styles.

Bug: 64122537
Bug: 69314526
Test: ag/3228846
Change-Id: I478dfdb5ea67ae1882cfee66050ed44fcda3d80d
---
 res/layout/storage_summary_donut.xml       |  2 +-
 res/layout/suggestion_tile_with_button.xml |  2 +-
 res/values/styles.xml                      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index 8e11d71f360..ce7e272a85e 100644
--- a/res/layout/storage_summary_donut.xml
+++ b/res/layout/storage_summary_donut.xml
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@android:id/summary"
             android:text="@string/storage_menu_free"
-            style="@android:style/@Widget.Material.Button.Colored" />
+            style="@style/ActionPrimaryButton" />
     </LinearLayout>
 
     <com.android.settings.widget.DonutView
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
index 085f88cf7c2..081df5b061f 100644
--- a/res/layout/suggestion_tile_with_button.xml
+++ b/res/layout/suggestion_tile_with_button.xml
@@ -61,7 +61,7 @@
 
         <Button
             android:id="@android:id/primary"
-            style="@style/SuwGlifButton.Primary"
+            style="@style/ActionPrimaryButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f3b67e292f7..8b6e1ec1210 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -337,10 +337,10 @@
 
     <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
 
-    <style name="SupportPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+    <style name="SupportPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
     <style name="SupportSecondaryButton"
-           parent="android:Widget.Material.Button.Borderless.Colored">
+           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
         <item name="android:textSize">12sp</item>
     </style>
 
@@ -424,11 +424,11 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="ActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
-    <style name="ActionSecondaryButton" parent="android:Widget.Material.Button"/>
+    <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
-    <style name="DreamStartButton" parent="android:Widget.Material.Button" />
+    <style name="DreamStartButton" parent="android:Widget.DeviceDefault.Button" />
 
     <style name="LockPatternContainerStyle">
         <item name="android:maxHeight">400dp</item>