commit b1edae2d0485a0a822091cf713d6e58bcfde97e6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 28 21:23:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 28 21:23:49 2017 +0000
tree f8d2694b1479473e67023db2995b306c81931f29
parent 22ca66df945648790a31d6dd473ea38b3934a910
parent 0efac4693fe6eb711e3e8f515fc7693f02f1ee07

Merge "Update Settings to use DeviceDefault colored button"

res/layout/storage_summary_donut.xml

diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index 8e11d71..ce7e272 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

res/layout/suggestion_tile_with_button.xml

diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
index 085f88c..081df5b 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"

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e2b6d44..7c43e99 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -338,10 +338,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>
 
@@ -425,11 +425,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>