commit 95f905b3c09ba510abdc1e276aea39973e61725b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 12 23:43:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 23:43:47 2016 +0000
tree c54824aa39238d9414c30dce11520b851921befb
parent 22176641b209d54b5df1e6e3b59ab80ff278e44a
parent ea24bbf317816d4aa55d822a1f76ffb6f9a0b637

Merge "Add ripples to negative buttons" into nyc-mr1-dev

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index cc6dc30..87da4b3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -286,15 +286,18 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="SetupWizardButton.Negative" parent="@android:style/TextAppearance.Widget.TextView">
-        <item name="android:background">@null</item>
+    <style name="SetupWizardButton.Negative" parent="@android:style/Widget.Material.Button.Borderless.Colored">
         <item name="android:minWidth">0dp</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">?android:attr/colorControlActivated</item>
+        <item name="android:theme">@style/AccentColorHighlightBorderlessButton</item>
     </style>
 
     <style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" />
 
+    <style name="AccentColorHighlightBorderlessButton">
+        <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
+    </style>
+
     <style name="vpn_label">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>