commit 57f49d939d93623b52b3f3f7f73b713c4e07e2aa
author Setup Wizard Team <android-setup-team-eng@google.com> Mon May 31 03:41:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 31 03:41:04 2021 +0000
tree fa37846e95a406f0e5eab74fb99caefb28e735dd
parent d5c6ce7883b3dc2d85312c4324bbfc8b84c42b97
parent 96c1ad461a5c78d14fa0fe92aa82861814e68934

Import updated Android Setupdesign Library 376136887 am: 96c1ad461a

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupdesign/+/14732268

Change-Id: Iaf88556b1add1fd1e5f9847cfa4586afaa7e8a1e

main/res/values-v31/styles.xml

diff --git a/main/res/values-v31/styles.xml b/main/res/values-v31/styles.xml
index 4b76447..0b7de5b 100644
--- a/main/res/values-v31/styles.xml
+++ b/main/res/values-v31/styles.xml
@@ -19,14 +19,14 @@
   <style name="SudDynamicColorThemeGlifV3" parent="SudThemeGlifV3">
     <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_dark</item>
     <item name="android:textColorLink">@color/sud_dynamic_color_accent_glif_v3_dark</item>
-    <item name="alertDialogTheme">@style/SudAlertDialogTheme</item>
+    <item name="alertDialogTheme">@style/SudDynamicColorAlertDialogThemeCompat</item>
     <item name="sucFullDynamicColor">false</item>
   </style>
 
   <style name="SudDynamicColorThemeGlifV3.Light" parent="SudThemeGlifV3.Light">
     <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_light</item>
     <item name="android:textColorLink">@color/sud_dynamic_color_accent_glif_v3_light</item>
-    <item name="alertDialogTheme">@style/SudAlertDialogTheme.Light</item>
+    <item name="alertDialogTheme">@style/SudDynamicColorAlertDialogThemeCompat.Light</item>
     <item name="sucFullDynamicColor">false</item>
   </style>
 
@@ -50,7 +50,7 @@
     <item name="colorButtonNormal">@color/button_material_dark</item>
     <item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item>
 
-    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogTheme</item>
+    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogThemeCompat</item>
 
     <item name="sucFullDynamicColor">true</item>
   </style>
@@ -74,21 +74,31 @@
     <item name="colorButtonNormal">@color/button_material_light</item>
     <item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>
 
-    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogTheme.Light</item>
+    <item name="alertDialogTheme">@style/SudFullDynamicColorAlertDialogThemeCompat.Light</item>
 
     <item name="sucFullDynamicColor">true</item>
   </style>
 
-  <style name="SudAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert">
-    <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_dark</item>
+
+  <style name="SudDynamicColorAlertDialogThemeCompat" parent="Theme.AppCompat.Dialog.Alert">
+    <item name="android:textAllCaps">false</item>
     <item name="android:colorBackground">@color/sud_glif_v3_dialog_background_color_dark</item>
+    <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_dark</item>
+    <item name="dialogCornerRadius">@dimen/sud_glif_device_default_dialog_corner_radius</item>
   </style>
 
-  <style name="SudAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert">
-    <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_light</item>
+  <style name="SudDynamicColorAlertDialogThemeCompat.Light" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:textAllCaps">false</item>
     <item name="android:colorBackground">@color/sud_glif_v3_dialog_background_color_light</item>
+    <item name="colorAccent">@color/sud_dynamic_color_accent_glif_v3_light</item>
+    <item name="dialogCornerRadius">@dimen/sud_glif_device_default_dialog_corner_radius</item>
   </style>
 
-  <style name="SudFullDynamicColorAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert"/>
-  <style name="SudFullDynamicColorAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert"/>
+  <style name="SudFullDynamicColorAlertDialogThemeCompat" parent="SudDynamicColorAlertDialogThemeCompat">
+    <item name="android:colorBackground">@color/sud_system_neutral1_900</item>
+  </style>
+  <style name="SudFullDynamicColorAlertDialogThemeCompat.Light" parent="SudDynamicColorAlertDialogThemeCompat.Light">
+    <item name="android:colorBackground">@color/sud_system_neutral1_50</item>
+  </style>
+
 </resources>

main/res/values/dimens.xml

diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml
index b309981..e2d0a94 100644
--- a/main/res/values/dimens.xml
+++ b/main/res/values/dimens.xml
@@ -40,6 +40,7 @@
 
     <dimen name="sud_glif_alert_dialog_corner_radius">8dp</dimen>
     <dimen name="sud_glif_v3_button_corner_radius">4dp</dimen>
+    <dimen name="sud_glif_device_default_dialog_corner_radius">28dp</dimen>
     <dimen name="sud_glif_land_header_area_weight">1</dimen>
     <dimen name="sud_glif_land_content_area_weight">1</dimen>
     <dimen name="sud_glif_land_middle_horizontal_spacing">48dp</dimen>