diff options
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 1706 |
1 files changed, 853 insertions, 853 deletions
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index f5c67387cb92..452ae04c7199 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -212,30 +212,30 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> <item name="colorPopupBackground">?attr/colorBackgroundFloating</item> <item name="panelColorBackground">?attr/colorBackgroundFloating</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -314,28 +314,28 @@ easier. <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Material.NoActionBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -431,28 +431,28 @@ easier. <style name="Theme.DeviceDefault.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -550,28 +550,28 @@ easier. <style name="Theme.DeviceDefault.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -668,28 +668,28 @@ easier. <style name="Theme.DeviceDefault.NoActionBar.TranslucentDecor" parent="Theme.Material.NoActionBar.TranslucentDecor"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -801,28 +801,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -911,28 +911,28 @@ easier. <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1027,28 +1027,28 @@ easier. <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1144,28 +1144,28 @@ easier. <style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1277,28 +1277,28 @@ easier. <style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1395,28 +1395,28 @@ easier. <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1511,28 +1511,28 @@ easier. <style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1629,28 +1629,28 @@ easier. <style name="Theme.DeviceDefault.Panel" parent="Theme.Material.Panel"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1746,28 +1746,28 @@ easier. <style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Material.Wallpaper"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1863,28 +1863,28 @@ easier. <style name="Theme.DeviceDefault.Wallpaper.NoTitleBar" parent="Theme.Material.Wallpaper.NoTitleBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -1980,28 +1980,28 @@ easier. <style name="Theme.DeviceDefault.InputMethod" parent="Theme.Material.InputMethod"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -2097,28 +2097,28 @@ easier. <style name="Theme.DeviceDefault.VoiceInteractionSession" parent="Theme.Material.VoiceInteractionSession"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -2218,28 +2218,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -2336,28 +2336,28 @@ easier. <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Material.SearchBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -2451,28 +2451,28 @@ easier. <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -2720,28 +2720,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> <item name="colorPopupBackground">?attr/colorBackgroundFloating</item> @@ -2821,28 +2821,28 @@ easier. <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Material.Light.DarkActionBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_device_default_dark</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -2937,28 +2937,28 @@ easier. <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Material.Light.NoActionBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3054,28 +3054,28 @@ easier. <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="Theme.Material.Light.NoActionBar.Fullscreen"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3173,28 +3173,28 @@ easier. <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="Theme.Material.Light.NoActionBar.Overscan"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3291,28 +3291,28 @@ easier. <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="Theme.Material.Light.NoActionBar.TranslucentDecor"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3426,28 +3426,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3535,28 +3535,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3654,28 +3654,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3774,28 +3774,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3895,26 +3895,26 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -3996,26 +3996,26 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4096,28 +4096,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4217,28 +4217,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4336,28 +4336,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4454,28 +4454,28 @@ easier. <style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Material.Light.Panel"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4571,28 +4571,28 @@ easier. <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4688,28 +4688,28 @@ easier. <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Material.Light.SearchBar"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4803,28 +4803,28 @@ easier. <style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice"> <!-- Color palette --> <item name="colorPrimary">@color/primary_device_default_light</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item> + <item name="colorPrimaryDark">@color/primary_device_default_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -4932,21 +4932,21 @@ easier. <item name="popupTheme">@style/ThemeOverlay.DeviceDefault.Popup.Light</item> <!-- Color palette --> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorPrimary">@color/primary_device_default_settings_light</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item> <item name="colorSecondary">@color/secondary_device_default_settings_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorEdgeEffect">@color/edge_effect_device_default_light</item> @@ -5044,16 +5044,16 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item> <item name="colorSecondary">@color/secondary_device_default_settings_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorControlNormal">?attr/textColorPrimary</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item> @@ -5148,16 +5148,16 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item> <item name="colorSecondary">@color/secondary_device_default_settings_light</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item> @@ -5245,26 +5245,26 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item> <item name="colorSecondary">@color/secondary_device_default_settings</item> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> - <item name="colorSurface">@color/surface_dark</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> - <item name="colorSurfaceVariant">@color/surface_variant_dark</item> - <item name="colorSurfaceHeader">@color/surface_header_dark</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_dark</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_dark</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_dark</item> + <item name="colorSurface">@color/system_surface_container_dark</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_dark</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_dark</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackground">@color/system_surface_container_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_light</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_dark</item> + <item name="textColorSecondary">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiary">@color/system_outline_dark</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_light</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_light</item> + <item name="textColorTertiaryInverse">@color/system_outline_light</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> @@ -5361,26 +5361,26 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item> <item name="colorSecondary">@color/secondary_device_default_settings</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -5487,26 +5487,26 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item> <item name="colorSecondary">@color/secondary_device_default_settings</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -5606,26 +5606,26 @@ easier. <item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item> <item name="colorSecondary">@color/secondary_device_default_settings</item> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> - <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> - <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> - <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> - <item name="colorSurface">@color/surface_light</item> - <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> - <item name="colorSurfaceVariant">@color/surface_variant_light</item> - <item name="colorSurfaceHeader">@color/surface_header_light</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> + <item name="colorAccentPrimaryVariant">@color/system_primary_container_light</item> + <item name="colorAccentSecondaryVariant">@color/system_secondary_container_light</item> + <item name="colorAccentTertiaryVariant">@color/system_tertiary_container_light</item> + <item name="colorSurface">@color/system_surface_container_light</item> + <item name="colorSurfaceHighlight">@color/system_surface_bright_light</item> + <item name="colorSurfaceVariant">@color/system_surface_container_high_light</item> + <item name="colorSurfaceHeader">@color/system_surface_container_highest_light</item> <item name="colorError">@color/error_color_device_default_light</item> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> - <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> - <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> - <item name="textColorTertiary">@color/text_color_tertiary_device_default_light</item> - <item name="textColorPrimaryInverse">@color/text_color_primary_device_default_dark</item> - <item name="textColorSecondaryInverse">@color/text_color_secondary_device_default_dark</item> - <item name="textColorTertiaryInverse">@color/text_color_tertiary_device_default_dark</item> - <item name="textColorOnAccent">@color/text_color_on_accent_device_default</item> + <item name="textColorPrimary">@color/system_on_surface_light</item> + <item name="textColorSecondary">@color/system_on_surface_variant_light</item> + <item name="textColorTertiary">@color/system_outline_light</item> + <item name="textColorPrimaryInverse">@color/system_on_surface_dark</item> + <item name="textColorSecondaryInverse">@color/system_on_surface_variant_dark</item> + <item name="textColorTertiaryInverse">@color/system_outline_dark</item> + <item name="textColorOnAccent">@color/system_on_primary_dark</item> <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> @@ -5788,9 +5788,9 @@ easier. <style name="ThemeOverlay.DeviceDefault.Accent"> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> @@ -5863,9 +5863,9 @@ easier. <style name="ThemeOverlay.DeviceDefault.Accent.Light"> <item name="colorAccent">@color/accent_device_default_light</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> @@ -5938,13 +5938,13 @@ easier. <!-- Theme overlay that replaces colorAccent with the colorAccent from {@link #Theme_DeviceDefault_DayNight}. --> <style name="ThemeOverlay.DeviceDefault.Accent.DayNight" - parent="@style/ThemeOverlay.DeviceDefault.Accent.Light" /> + parent="@style/ThemeOverlay.DeviceDefault.Accent.Light" /> <style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="ThemeOverlay.Material.Dark.ActionBar"> <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorAccentPrimary">@color/accent_primary_device_default</item> - <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> - <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimary">@color/system_primary_dark</item> + <item name="colorAccentSecondary">@color/system_secondary_dark</item> + <item name="colorAccentTertiary">@color/system_tertiary_dark</item> <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> @@ -6016,7 +6016,7 @@ easier. </style> <style name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" parent="Theme.DeviceDefault.NoActionBar.Fullscreen"> - <item name="colorBackground">@color/background_device_default_light</item> + <item name="colorBackground">@color/system_surface_container_light</item> <item name="colorBackgroundFloating">@color/background_device_default_light</item> <item name="layout_gravity">center</item> <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item> |