From d115369c33bc3252072149822dacc0e01f882ad7 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Sun, 18 Mar 2018 14:26:27 -0700
Subject: [PATCH] Update buttons to use proper styles.

Autofill Save button now using Widget.DeviceDefault.Button.Colored.

Updates Theme.DeviceDefault.Resolver to use DeviceDefault styles
for attributes.

Change-Id: I78b3665f57b9356807882f1db6d20665ef296ef1
Fixes: 69973278
Fixes: 73861181
Test: visual inspection
---
 core/res/res/layout/autofill_save.xml          | 2 +-
 core/res/res/values/themes_device_defaults.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml
index 5c5b985b26a23..968261273752b 100644
--- a/core/res/res/layout/autofill_save.xml
+++ b/core/res/res/layout/autofill_save.xml
@@ -100,7 +100,7 @@
                 android:id="@+id/autofill_save_yes"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/Widget.Material.Button.Colored"
+                style="@style/Widget.DeviceDefault.Button.Colored"
                 android:text="@string/autofill_save_yes">
             </Button>
 
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 25b053b0f0c5e..2327b33e83a72 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -1449,6 +1449,10 @@ easier.
         <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>
         <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>
 
+        <!-- Button styles -->
+        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>
+        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>
+
         <!-- Color palette -->
         <item name="colorPrimary">@color/primary_device_default_light</item>
         <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>