Set corner radius for GLIF buttons

In GLIF v2, the corner radius stays at 2dp, but now referencing a
resource defined inside the library itself.
In GLIF v3, the corner radius is 4dp. Note that this only affects
device running P or above since the corner radius API is new.

Test: Manual + Existing tests pass
Bug: 73252680
Change-Id: Ia7110b097c5217b54ed363939158d1960f56f02a

5 files changed, 22 insertions, 0 deletions

diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 2287d27..241f037 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -108,6 +108,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -146,6 +147,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -166,12 +168,14 @@
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
     <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light">
         <item name="colorAccent">@color/suw_color_accent_glif_v3</item>
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
     <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" />
@@ -231,6 +235,9 @@
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
         <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">?attr/suwButtonAllCaps</item>
         <item name="textAllCaps">?attr/suwButtonAllCaps</item>
+
+        <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -250,6 +257,7 @@
         <item name="textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
         <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item>
         <item name="colorControlHighlight">@color/suw_flat_button_highlight</item>
     </style>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 7a7580d..b3fcfe9 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -41,6 +41,7 @@
     <attr name="suwGlifIconStyle" format="reference" />
 
     <attr name="suwButtonAllCaps" format="boolean" />
+    <attr name="suwButtonCornerRadius" format="dimension" />
     <attr name="suwButtonFontFamily" format="string|reference" />
     <attr name="suwCardBackground" format="color|reference" />
     <attr name="suwDividerCondition">
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index f5c2563..69475b2 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -20,6 +20,7 @@
     <!-- General -->
     <dimen name="suw_layout_margin_sides">40dp</dimen>
 
+    <dimen name="suw_glif_button_corner_radius">2dp</dimen>
     <!-- Calculated by (suw_glif_margin_sides - 4dp internal padding of button) -->
     <dimen name="suw_glif_button_margin_end">20dp</dimen>
     <!-- Calculated by (suw_glif_margin_sides - suw_glif_button_padding) -->
@@ -30,6 +31,8 @@
     <dimen name="suw_glif_margin_sides">24dp</dimen>
     <dimen name="suw_glif_margin_top">48dp</dimen>
 
+    <dimen name="suw_glif_v3_button_corner_radius">4dp</dimen>
+
     <!-- Content styles -->
     <dimen name="suw_check_box_line_spacing_extra">4sp</dimen>
     <dimen name="suw_check_box_margin_bottom">12dp</dimen>
diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml
index ba287fc..6e36919 100644
--- a/library/platform/res/values-v27/styles.xml
+++ b/library/platform/res/values-v27/styles.xml
@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 
+<!-- TODO(yukl): Bump this file to v28 once we can properly test that -->
 <!-- These styles are only included in the platform build, to make sure that they do not
      override the corresponding styles in the compatibility build. -->
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -107,6 +108,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -142,6 +144,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwButtonAllCaps">true</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item>
         <item name="suwButtonFontFamily">sans-serif</item>
         <item name="suwColorPrimary">?android:attr/colorPrimary</item>
         <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
@@ -161,6 +164,7 @@
         <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item>
 
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
@@ -173,6 +177,7 @@
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
 
         <item name="suwButtonAllCaps">false</item>
+        <item name="suwButtonCornerRadius">@dimen/suw_glif_v3_button_corner_radius</item>
         <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item>
     </style>
 
@@ -189,6 +194,9 @@
         <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
         <item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
         <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
+
+        <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
     </style>
 
     <style name="SuwGlifButton.Secondary" parent="android:Widget.Material.Button.Borderless.Colored">
@@ -206,6 +214,7 @@
         <item name="android:textAllCaps">?attr/suwButtonAllCaps</item>
 
         <!-- Values used in themes -->
+        <item name="android:buttonCornerRadius" tools:ignore="NewApi">?attr/suwButtonCornerRadius</item>
         <item name="android:colorControlHighlight">@color/suw_flat_button_highlight</item>
     </style>
 
diff --git a/library/rules.gradle b/library/rules.gradle
index f6dfafc..9baa390 100644
--- a/library/rules.gradle
+++ b/library/rules.gradle
@@ -19,6 +19,7 @@ android {
         // DEPRECATED: Platform version that will not include the compatibility libraries
         platformDeprecated {
             dimension 'compat'
+            // TODO(yukl): Bump this file to v28 once we can properly test that
             minSdkVersion 27
         }