From 848a388a71328c5e67488608c17c47ab41c996e1 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Mon, 7 Jun 2021 18:06:40 +0100
Subject: [PATCH] RequestManageCredentials Material Next Spec

* Update buttons to have rounded corners
  and more padding
* Update text colour of buttons
* Update floating action button background
  and text colour

Manual Testing via TestDPC
* Light mode https://screenshot.googleplex.com/8MxZZjftRFMXJhM
* Dark mode https://screenshot.googleplex.com/3vgWrEJnCbzUdhh
* Floating action button https://screenshot.googleplex.com/5H4nfTWz7sNJJmT
* Landscape

Bug: 189193577
Test: Manual testing
       RequestManageCredentialsTest
Change-Id: Iba8b4b6af655abfdab6216e6042ee222c3f745dd
---
 res/layout-land/request_manage_credentials.xml |  5 +++--
 res/layout/request_manage_credentials.xml      |  5 +++--
 res/values/styles.xml                          | 13 +++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/res/layout-land/request_manage_credentials.xml b/res/layout-land/request_manage_credentials.xml
index bf00098e723..0c7bded8a99 100644
--- a/res/layout-land/request_manage_credentials.xml
+++ b/res/layout-land/request_manage_credentials.xml
@@ -108,6 +108,7 @@
                         <Button
                             android:id="@+id/allow_button"
                             style="@style/RequestManageCredentialsAllowButton"
+                            android:theme="@style/RoundedCornerButtonTheme"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/request_manage_credentials_allow" />
@@ -123,10 +124,10 @@
                     android:layout_height="wrap_content"
                     android:text="@string/request_manage_credentials_more"
                     android:theme="@style/Theme.CollapsingToolbar.Settings"
-                    app:backgroundTint="?android:attr/colorPrimary"
+                    app:backgroundTint="?android:attr/colorAccent"
                     app:elevation="3dp"
                     app:icon="@drawable/ic_arrow_downward"
-                    app:iconTint="?android:attr/colorAccent"
+                    app:iconTint="?android:attr/textColorPrimary"
                     app:layout_anchor="@id/apps_list"
                     app:layout_anchorGravity="bottom|center" />
 
diff --git a/res/layout/request_manage_credentials.xml b/res/layout/request_manage_credentials.xml
index ee3751cba53..c8167b6ac1d 100644
--- a/res/layout/request_manage_credentials.xml
+++ b/res/layout/request_manage_credentials.xml
@@ -52,6 +52,7 @@
             <Button
                 android:id="@+id/allow_button"
                 style="@style/RequestManageCredentialsAllowButton"
+                android:theme="@style/RoundedCornerButtonTheme"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/request_manage_credentials_allow"/>
@@ -70,8 +71,8 @@
         app:layout_anchorGravity="bottom|center"
         app:elevation="3dp"
         app:icon="@drawable/ic_arrow_downward"
-        app:iconTint="?android:attr/colorAccent"
-        app:backgroundTint="?android:attr/colorPrimary"
+        app:iconTint="?android:attr/textColorPrimary"
+        app:backgroundTint="?android:attr/colorAccent"
         android:theme="@style/Theme.CollapsingToolbar.Settings"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b3f1325b407..4ff3d9f1000 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -796,10 +796,19 @@
         <item name="android:background">?android:colorBackground</item>
     </style>
 
+    <style name="RoundedCornerButtonTheme">
+        <item name="android:buttonCornerRadius">50dp</item>
+        <item name="android:paddingStart">20dp</item>
+        <item name="android:paddingEnd">20dp</item>
+        <item name="android:paddingTop">18dp</item>
+        <item name="android:paddingBottom">18dp</item>
+    </style>
+
     <style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton">
         <item name="android:fontFamily">google-sans-medium</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="RequestManageCredentialsDontAllowButton"
@@ -807,13 +816,13 @@
         <item name="android:fontFamily">google-sans-medium</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="RequestManageCredentialsFab">
         <item name="android:textSize">14sp</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:layout_marginBottom">12dp</item>
     </style>