diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-06-03 09:38:33 +0800 |
---|---|---|
committer | Nicole Huang <nicolehuang@google.com> | 2021-06-03 04:42:40 +0000 |
commit | fdbcc61ac6271d776cc4c32b221391b8be630620 (patch) | |
tree | 4879f3e3e5d507d77545f77a294e5c42c8b4f8fb /main/res | |
parent | 96c1ad461a5c78d14fa0fe92aa82861814e68934 (diff) | |
download | setupdesign-fdbcc61ac6271d776cc4c32b221391b8be630620.tar.gz |
Import updated Android Setupdesign Library 377192531
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Bug: 189741363
Included changes:
- 377192531 [ColorExtraction] Adjusts error color for color extraction.
- 377006422 [DynamicColor] Adds testcase for DynamicColorPalette.
- 376739070 Extract IconUniformityAppImageView to setup compat library
- 376633744 [GlifLoadingLayout] Fixes using make measure spec causes ...
PiperOrigin-RevId: 377192531
Change-Id: I3da964364738db3637f8d2e884c77bb5413bd44d
Diffstat (limited to 'main/res')
-rw-r--r-- | main/res/values-night-v31/colors.xml | 2 | ||||
-rw-r--r-- | main/res/values-night/colors.xml | 2 | ||||
-rw-r--r-- | main/res/values-v31/colors.xml | 6 | ||||
-rw-r--r-- | main/res/values/colors.xml | 7 | ||||
-rw-r--r-- | main/res/values/dimens.xml | 4 |
5 files changed, 20 insertions, 1 deletions
diff --git a/main/res/values-night-v31/colors.xml b/main/res/values-night-v31/colors.xml index fda7fa0..7aee45c 100644 --- a/main/res/values-night-v31/colors.xml +++ b/main/res/values-night-v31/colors.xml @@ -19,9 +19,11 @@ <!-- Accent color --> <color name="sud_dynamic_color_accent_glif_v3">@color/sud_dynamic_color_accent_glif_v3_dark</color> + <color name="sud_system_primary_text">@color/sud_system_neutral1_50</color> <color name="sud_system_secondary_text">@color/sud_system_neutral2_200</color> <color name="sud_system_tertiary_text_inactive">@color/sud_system_neutral2_400</color> + <color name="sud_system_error_warning">@color/sud_error_warning_default_dark</color> <color name="sud_system_background_surface">@color/sud_system_neutral1_900</color> <color name="sud_system_accent_icon_text_button">@color/sud_system_accent1_200</color> <color name="sud_system_button_surface">@color/sud_system_accent1_100</color> diff --git a/main/res/values-night/colors.xml b/main/res/values-night/colors.xml index b9a0975..1062ea7 100644 --- a/main/res/values-night/colors.xml +++ b/main/res/values-night/colors.xml @@ -26,4 +26,6 @@ <color name="sud_portal_pending_progress">@color/sud_portal_pending_progress_dark</color> + + <color name="sud_uniformity_backdrop_color">#2A2B2E</color> </resources>
\ No newline at end of file diff --git a/main/res/values-v31/colors.xml b/main/res/values-v31/colors.xml index b2067c1..c3c6ab5 100644 --- a/main/res/values-v31/colors.xml +++ b/main/res/values-v31/colors.xml @@ -28,6 +28,11 @@ <color name="sud_dynamic_color_accent_glif_v3_light">@color/sud_system_accent1_600</color> + <color name="sud_error_warning_default_dark">#F28B82</color> + + <color name="sud_error_warning_default_light">#EA4335</color> + + <color name="sud_system_accent1_100">@android:color/system_accent1_100</color> @@ -65,6 +70,7 @@ <color name="sud_system_primary_text">@color/sud_system_neutral1_900</color> <color name="sud_system_secondary_text">@color/sud_system_neutral2_700</color> <color name="sud_system_tertiary_text_inactive">@color/sud_system_neutral2_500</color> + <color name="sud_system_error_warning">@color/sud_error_warning_default_light</color> <color name="sud_system_background_surface">@color/sud_system_neutral1_50</color> <color name="sud_system_accent_icon_text_button">@color/sud_system_accent1_600</color> <color name="sud_system_button_surface">@color/sud_system_accent1_100</color> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 7d1acad..7c27547 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -128,11 +128,13 @@ <color name="sud_error_warning_default_dark">#EE675C</color> + <color name="sud_error_warning_default_light">#D93025</color> + <color name="sud_system_primary_text">@color/sud_primary_default_text_light</color> <color name="sud_system_secondary_text">@color/sud_secondary_default_text_light</color> <color name="sud_system_tertiary_text_inactive">@color/sud_inactive_default_light</color> - <color name="sud_system_error_warning">@color/sud_color_error_text_light</color> + <color name="sud_system_error_warning">@color/sud_error_warning_default_light</color> <color name="sud_system_success_done">@color/success_color_device_default_light</color> <color name="sud_system_fallback_accent">@color/fallback_color_device_default_light</color> @@ -141,4 +143,7 @@ <color name="sud_switch_track_off">#FF757575</color> <color name="sud_switch_thumb_off">#BFFFFFFF</color> + + <color name="sud_uniformity_backdrop_color">@android:color/white</color> + </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index e2d0a94..64970c8 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -213,4 +213,8 @@ <!-- Radius of switch track --> <dimen name="sud_switch_track_radius">35dp</dimen> + <!-- IconUniformityAppImageView --> + <!-- Set 0dp since we don't want shadow. --> + <dimen name="sud_icon_uniformity_elevation">0dp</dimen> + </resources> |