From 7b8eea386c7883171e989df4a8433d0326660eb7 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Fri, 2 Jul 2021 12:45:20 +0800
Subject: [PATCH] Refine the ripple effect and text style of
 ActionPrimaryButton

- The background color of the button is inverted, which has to be
  applied to inverse ripple colors.
- Update the font size and family.

Fixes: 190338973
Test: visual, manual
Change-Id: Ia7447b5e2f64546e0f011cca904d1317d6a38cf1
---
 res/values-night/colors.xml | 3 +++
 res/values/colors.xml       | 3 +++
 res/values/styles.xml       | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index c63b7c1191b..4e4ee5ddb22 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -49,5 +49,8 @@
     <color name="biometric_enroll_intro_color_icon">#669df6</color>
     <color name="biometric_enroll_intro_color_outline">#5e5e5e</color>
     <color name="fingerprint_enrollment_finish_color_outline">#669df6</color>
+
+    <!-- Material inverse ripple color, useful for inverted backgrounds. -->
+    <color name="ripple_material_inverse">@*android:color/ripple_material_light</color>
 </resources>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a3a7d03d762..0fe4975550e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -207,4 +207,7 @@
 
     <!-- Fingerprint enrollment color -->
     <color name="fingerprint_enrollment_finish_color_outline">#1A73E8</color>
+
+    <!-- Material inverse ripple color, useful for inverted backgrounds. -->
+    <color name="ripple_material_inverse">@*android:color/ripple_material_dark</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 63ea86ebe3b..64ae202e594 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -407,13 +407,15 @@
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored">
         <item name="android:theme">@style/RoundedCornerThemeOverlay</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
     </style>
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
     <style name="RoundedCornerThemeOverlay">
         <item name="android:buttonCornerRadius">24dp</item>
-        <item name="android:paddingStart">16dp</item>
-        <item name="android:paddingEnd">16dp</item>
+        <item name="android:paddingHorizontal">16dp</item>
+        <item name="android:colorControlHighlight">@color/ripple_material_inverse</item>
     </style>
 
     <style name="LockPatternContainerStyle">