summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2021-05-27 18:53:05 +0800
committerCn Chen <cnchen@google.com>2021-05-27 10:59:28 +0000
commit96c1ad461a5c78d14fa0fe92aa82861814e68934 (patch)
treefa37846e95a406f0e5eab74fb99caefb28e735dd
parent8fcf8fe4693d4a261e4bf55dafe32b711351b289 (diff)
downloadsetupdesign-96c1ad461a5c78d14fa0fe92aa82861814e68934.tar.gz
Import updated Android Setupdesign Library 376136887
Copied from google3/third_party/java_src/android_libs/setupdesign Bug: 189281484 Test: mm Included changes: - 376136887 Fix the dialog style PiperOrigin-RevId: 376136887 Change-Id: Idd9bfcb8e4b48619ffc6faadc511a019dd4bf9e3
-rw-r--r--main/res/values-v31/styles.xml30
-rw-r--r--main/res/values/dimens.xml1
2 files changed, 21 insertions, 10 deletions
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="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>
- <style name="SudFullDynamicColorAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert"/>
- <style name="SudFullDynamicColorAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert"/>
</resources>
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>