From 673b4757877be3722e24c415dcf56098bb6b4b80 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Tue, 13 Jul 2021 01:31:02 -0700
Subject: [PATCH] AA+ Final UX spec changes

Bug: 192670508
Test: manual

Change-Id: Id448f31adef851175306cd513974a64a1f029e50
---
 res/drawable/padded_rounded_action_button.xml | 15 ++++++++-------
 res/layout/work_apps_edu.xml                  |  2 +-
 res/values/dimens.xml                         |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/res/drawable/padded_rounded_action_button.xml b/res/drawable/padded_rounded_action_button.xml
index 900f5fcf8c..6432efd539 100644
--- a/res/drawable/padded_rounded_action_button.xml
+++ b/res/drawable/padded_rounded_action_button.xml
@@ -16,14 +16,15 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
-    <item android:bottom="8dp" android:top="8dp">
+    <item
+        android:left="@dimen/padded_rounded_button_padding"
+        android:top="@dimen/padded_rounded_button_padding"
+        android:right="@dimen/padded_rounded_button_padding"
+        android:bottom="@dimen/padded_rounded_button_padding">
         <shape android:shape="rectangle">
-
-        <corners android:radius="@dimen/rounded_button_radius" />
-        <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />
-        <padding
-            android:left="@dimen/rounded_button_padding"
-            android:right="@dimen/rounded_button_padding" />
+            <corners android:radius="@dimen/rounded_button_radius" />
+            <stroke android:width="1dp"
+                android:color="?androidprv:attr/colorAccentPrimaryVariant" />
         </shape>
     </item>
 </layer-list>
diff --git a/res/layout/work_apps_edu.xml b/res/layout/work_apps_edu.xml
index 382b8fc0f2..1517087fe2 100644
--- a/res/layout/work_apps_edu.xml
+++ b/res/layout/work_apps_edu.xml
@@ -43,7 +43,7 @@
 
         <Button
             android:layout_width="match_parent"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/work_card_button_height"
             android:id="@+id/action_btn"
             android:textColor="?attr/workProfileOverlayTextColor"
             android:text="@string/work_profile_edu_accept"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ee2ceb1a54..f434644996 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,6 +122,7 @@
     <dimen name="work_fab_height">56dp</dimen>
     <dimen name="work_fab_radius">28dp</dimen>
     <dimen name="work_card_padding_horizontal">24dp</dimen>
+    <dimen name="work_card_button_height">52dp</dimen>
     <dimen name="work_fab_margin">16dp</dimen>
     <dimen name="work_profile_footer_padding">20dp</dimen>
     <dimen name="work_profile_footer_text_size">16sp</dimen>
@@ -329,4 +330,5 @@
 <!-- Search results related parameters -->
     <dimen name="search_row_icon_size">48dp</dimen>
     <dimen name="search_row_small_icon_size">32dp</dimen>
+    <dimen name="padded_rounded_button_padding">8dp</dimen>
 </resources>