diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-05-20 09:29:28 +0800 |
---|---|---|
committer | Nicole Huang <nicolehuang@google.com> | 2021-05-21 03:34:42 +0000 |
commit | 1e5fe000bc39ab96b17707e8aa066a2cfb360714 (patch) | |
tree | 232791de807ae753f7b5a8b3ca3d0cc53ee177ff /main/res | |
parent | 55c0d53a5db43d763c2b133002fb6d0971f4013b (diff) | |
download | setupdesign-1e5fe000bc39ab96b17707e8aa066a2cfb360714.tar.gz |
Import updated Android Setupdesign Library 374773193
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Bug: 188721222
Included changes:
- 374773193 [ColorExtraction] Adjust fallback colors for color resour...
- 374372964 Refactoring
- 374191048 Remove deprecated class
- 373747782 Fix hyperlink doesn't apply dynamic color
- 373731771 [SetupDesign] Fix the crash of SwitchBar and remove the i...
- 373539695 [GlifLoadingLayout] Gets actural min height of footer bar...
PiperOrigin-RevId: 374773193
Change-Id: I465cc1e59ee81e7174c337b8d5b58039e46eb067
Diffstat (limited to 'main/res')
-rw-r--r-- | main/res/values-night/colors.xml | 18 | ||||
-rw-r--r-- | main/res/values-v31/styles.xml | 2 | ||||
-rw-r--r-- | main/res/values/colors.xml | 58 | ||||
-rw-r--r-- | main/res/values/dimens.xml | 14 |
4 files changed, 33 insertions, 59 deletions
diff --git a/main/res/values-night/colors.xml b/main/res/values-night/colors.xml index 74a583e..b9a0975 100644 --- a/main/res/values-night/colors.xml +++ b/main/res/values-night/colors.xml @@ -17,23 +17,13 @@ <resources> - <color name="sud_system_primary_text">@color/primary_text_color_device_default_dark</color> - - <color name="sud_system_secondary_text">@color/secondary_text_color_device_default_dark</color> - - <color name="sud_system_tertiary_text_inactive">@color/tertiary_text_inactive_color_device_default_dark</color> - - <color name="sud_system_error_warning">@color/error_color_device_default_dark</color> - + <color name="sud_system_primary_text">@color/sud_primary_default_text_dark</color> + <color name="sud_system_secondary_text">@color/sud_secondary_default_text_dark</color> + <color name="sud_system_tertiary_text_inactive">@color/sud_inactive_default_dark</color> + <color name="sud_system_error_warning">@color/sud_error_warning_default_dark</color> <color name="sud_system_success_done">@color/success_color_device_default_dark</color> - <color name="sud_system_fallback_accent">@color/fallback_color_device_default_dark</color> - <color name="sud_system_background_surface">@color/background_surface_color_device_default_dark</color> - - <color name="sud_system_accent_icon_text_button">@color/accent_icon_text_color_device_default_dark</color> - - <color name="sud_system_dividing_line">@color/dividing_line_color_device_default_dark</color> <color name="sud_portal_pending_progress">@color/sud_portal_pending_progress_dark</color> </resources>
\ No newline at end of file diff --git a/main/res/values-v31/styles.xml b/main/res/values-v31/styles.xml index deaea16..b754be1 100644 --- a/main/res/values-v31/styles.xml +++ b/main/res/values-v31/styles.xml @@ -71,4 +71,4 @@ <item name="sucFullDynamicColor">true</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 4ce7602..d658e9b 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -18,7 +18,6 @@ <resources> <!-- General colors --> - <color name="sud_color_accent_dark">#ff448aff</color> <color name="sud_color_accent_light">#ff3367d6</color> <color name="sud_color_background_dark">#ff303030</color> @@ -35,7 +34,6 @@ <color name="sud_flat_button_highlight">#1f000000</color> <!-- Navigation bar colors --> - <color name="sud_navbar_bg_dark">#ff21272b</color> <color name="sud_navbar_bg_light">#ffe4e7e9</color> @@ -103,10 +101,6 @@ <color name="sud_system_neutral2_700">#464646</color> - <color name="error_color_device_default_dark">#ec928e</color> - - <color name="error_color_device_default_light">#E22518</color> - <color name="success_color_device_default_dark">#5BB974</color> <color name="success_color_device_default_light">#1E8E3E</color> @@ -119,55 +113,31 @@ <color name="sud_portal_pending_progress_dark">#b06000</color> - <color name="primary_text_color_device_default_dark">#EDF2EB</color> - - <color name="primary_text_color_device_default_light">#181C14</color> - - <color name="secondary_text_color_device_default_dark">#C4C9BC</color> - - <color name="secondary_text_color_device_default_light">#43483F</color> - - <color name="tertiary_text_inactive_color_device_default_dark">#8D9287</color> - - <color name="tertiary_text_inactive_color_device_default_light">#72776C</color> - - <color name="background_surface_color_device_default_dark">#1B1D19</color> + <color name="sud_primary_default_text_dark">#FFFFFF</color> - <color name="background_surface_color_device_default_light">#F1F1EB</color> + <color name="sud_primary_default_text_light">#202124</color> - <color name="accent_icon_text_color_device_default_dark">#9FD67C</color> + <color name="sud_secondary_default_text_dark">#9AA0A6</color> - <color name="accent_icon_text_color_device_default_light">#3A691E</color> + <color name="sud_secondary_default_text_light">#5F6368</color> - <color name="button_surface_color_device_default">#BAF396</color> + <color name="sud_inactive_default_dark">#5F6368</color> - <color name="button_text_color_device_default">#1B1D19</color> + <color name="sud_inactive_default_light">#DADCE0</color> - <color name="dividing_line_color_device_default_dark">#43483F</color> + <color name="sud_error_warning_default_dark">#EE675C</color> - <color name="dividing_line_color_device_default_light">#A7ACA0</color> - - - <color name="sud_system_primary_text">@color/primary_text_color_device_default_light</color> - - <color name="sud_system_secondary_text">@color/secondary_text_color_device_default_light</color> - - <color name="sud_system_tertiary_text_inactive">@color/tertiary_text_inactive_color_device_default_light</color> - - <color name="sud_system_error_warning">@color/error_color_device_default_light</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_success_done">@color/success_color_device_default_light</color> - <color name="sud_system_fallback_accent">@color/fallback_color_device_default_light</color> - <color name="sud_system_background_surface">@color/background_surface_color_device_default_light</color> - - <color name="sud_system_accent_icon_text_button">@color/accent_icon_text_color_device_default_light</color> - - <color name="sud_system_button_surface">@color/button_surface_color_device_default</color> + <color name="sud_portal_pending_progress">@color/sud_portal_pending_progress_light</color> - <color name="sud_system_button_text">@color/button_text_color_device_default</color> + <color name="sud_switch_track_off">#FF757575</color> + <color name="sud_switch_thumb_off">#BFFFFFFF</color> - <color name="sud_system_dividing_line">@color/dividing_line_color_device_default_light</color> - <color name="sud_portal_pending_progress">@color/sud_portal_pending_progress_light</color> </resources> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index 5bdf41f..b309981 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -198,4 +198,18 @@ <!-- ExpandableSwithItem --> <dimen name="sud_expand_arrow_drawable_padding">4dp</dimen> + <!-- SwitchBar --> + <!-- Minimum width of switch --> + <dimen name="sud_switch_min_width">52dp</dimen> + <!-- Margin of switch thumb --> + <dimen name="sud_switch_thumb_margin">4dp</dimen> + <!-- Size of switch thumb --> + <dimen name="sud_switch_thumb_size">20dp</dimen> + <!-- Width of switch track --> + <dimen name="sud_switch_track_width">52dp</dimen> + <!-- Height of switch track --> + <dimen name="sud_switch_track_height">28dp</dimen> + <!-- Radius of switch track --> + <dimen name="sud_switch_track_radius">35dp</dimen> + </resources> |