From d1d889deee57761e14555051bc1c7cd712f8d5e9 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 22 Feb 2018 20:24:22 -0800
Subject: 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
---
 library/gingerbread/res/values/styles.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'library/gingerbread/res')

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>
-- 
cgit v1.2.3