diff options
| author | 2024-11-01 16:04:33 +0000 | |
|---|---|---|
| committer | 2024-11-12 11:45:41 +0000 | |
| commit | f1202fb52c3b7da60ea6d2afbf11ef108ed999b7 (patch) | |
| tree | 29e4a4295d8edeeeddefa784ea98999ebd414c57 | |
| parent | dd5840f5ecf99e91eaf723d64be3a13b101394f0 (diff) | |
Aligning Android color tokens with Material
Since this is a change that happens a couple times a year, we also updated the script that generates XML so we can easily update resource files in the future.
Because names now follow closely on Material, and now resources are alphabetically sorted, many lines are being shuffled.
With this new sorting, future updates would look much cleaner and easier to read.
In this update we are adding only 12 public color resources that are already in place in Material and need their counterparts here in Android. These are:
```
inverse_on_surface_light
inverse_primary_light
inverse_surface_light
scrim_light
shadow_light
surface_tint_light
inverse_on_surface_dark
inverse_primary_dark
inverse_surface_dark
scrim_dark
shadow_dark
surface_tint_dark
```
Regarding the dynamic private (0p only) attributes, the updates are just in the renaming of tokens. Like so:
```
OnSurfaceInverse -> InverseOnSurface
PrimaryInverse -> InversePrimary
SurfaceInverse -> InverseSurface
```
All dynamic attributes are will be removed in following CL and their usages will be replaced by color resources that are theme independent. For this reason the new private color resource are already being created in this change, but the attribute are kept for now, avoiding breaking changes.
Bug: 376195115
Bug: 241778903
Test: presubmits
Flag: com.android.systemui.material_colors_10_2024
Change-Id: Ief5c983336bbd822e0639f14cc57ab5680490572
19 files changed, 4059 insertions, 2999 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index e5517895aa49..0c28880de35f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2043,6 +2043,12 @@ package android { field public static final int system_error_container_light = 17170554; // 0x106007a field public static final int system_error_dark = 17170595; // 0x10600a3 field public static final int system_error_light = 17170552; // 0x1060078 + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_on_surface_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_on_surface_light; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_primary_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_primary_light; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_surface_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_inverse_surface_light; field public static final int system_neutral1_0 = 17170461; // 0x106001d field public static final int system_neutral1_10 = 17170462; // 0x106001e field public static final int system_neutral1_100 = 17170464; // 0x1060020 @@ -2119,12 +2125,16 @@ package android { field public static final int system_primary_fixed = 17170612; // 0x10600b4 field public static final int system_primary_fixed_dim = 17170613; // 0x10600b5 field public static final int system_primary_light = 17170528; // 0x1060060 + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_scrim_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_scrim_light; field public static final int system_secondary_container_dark = 17170573; // 0x106008d field public static final int system_secondary_container_light = 17170530; // 0x1060062 field public static final int system_secondary_dark = 17170575; // 0x106008f field public static final int system_secondary_fixed = 17170616; // 0x10600b8 field public static final int system_secondary_fixed_dim = 17170617; // 0x10600b9 field public static final int system_secondary_light = 17170532; // 0x1060064 + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_shadow_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_shadow_light; field public static final int system_surface_bright_dark = 17170590; // 0x106009e field public static final int system_surface_bright_light = 17170547; // 0x1060073 field public static final int system_surface_container_dark = 17170587; // 0x106009b @@ -2142,6 +2152,8 @@ package android { field public static final int system_surface_dim_light = 17170548; // 0x1060074 field public static final int system_surface_disabled = 17170626; // 0x10600c2 field public static final int system_surface_light = 17170540; // 0x106006c + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_surface_tint_dark; + field @FlaggedApi("com.android.systemui.material_colors_10_2024") public static final int system_surface_tint_light; field public static final int system_surface_variant_dark = 17170592; // 0x10600a0 field public static final int system_surface_variant_light = 17170549; // 0x1060075 field public static final int system_tertiary_container_dark = 17170577; // 0x1060091 diff --git a/core/res/res/values-night/colors_dynamic.xml b/core/res/res/values-night/colors_dynamic.xml new file mode 100644 index 000000000000..7e95ff4f409e --- /dev/null +++ b/core/res/res/values-night/colors_dynamic.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Colors specific to Material themes. --> +<resources> + <color name="materialColorBackground">@color/system_background_dark</color> + <color name="materialColorControlActivated">@color/system_control_activated_dark</color> + <color name="materialColorControlHighlight">@color/system_control_highlight_dark</color> + <color name="materialColorControlNormal">@color/system_control_normal_dark</color> + <color name="materialColorError">@color/system_error_dark</color> + <color name="materialColorErrorContainer">@color/system_error_container_dark</color> + <color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</color> + <color name="materialColorInversePrimary">@color/system_inverse_primary_dark</color> + <color name="materialColorInverseSurface">@color/system_inverse_surface_dark</color> + <color name="materialColorOnBackground">@color/system_on_background_dark</color> + <color name="materialColorOnError">@color/system_on_error_dark</color> + <color name="materialColorOnErrorContainer">@color/system_on_error_container_dark</color> + <color name="materialColorOnPrimary">@color/system_on_primary_dark</color> + <color name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</color> + <color name="materialColorOnSecondary">@color/system_on_secondary_dark</color> + <color name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</color> + <color name="materialColorOnSurface">@color/system_on_surface_dark</color> + <color name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</color> + <color name="materialColorOnTertiary">@color/system_on_tertiary_dark</color> + <color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</color> + <color name="materialColorOutline">@color/system_outline_dark</color> + <color name="materialColorOutlineVariant">@color/system_outline_variant_dark</color> + <color name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</color> + <color name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</color> + <color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</color> + <color name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</color> + <color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</color> + <color name="materialColorPrimary">@color/system_primary_dark</color> + <color name="materialColorPrimaryContainer">@color/system_primary_container_dark</color> + <color name="materialColorScrim">@color/system_scrim_dark</color> + <color name="materialColorSecondary">@color/system_secondary_dark</color> + <color name="materialColorSecondaryContainer">@color/system_secondary_container_dark</color> + <color name="materialColorShadow">@color/system_shadow_dark</color> + <color name="materialColorSurface">@color/system_surface_dark</color> + <color name="materialColorSurfaceBright">@color/system_surface_bright_dark</color> + <color name="materialColorSurfaceContainer">@color/system_surface_container_dark</color> + <color name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</color> + <color name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</color> + <color name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</color> + <color name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</color> + <color name="materialColorSurfaceDim">@color/system_surface_dim_dark</color> + <color name="materialColorSurfaceTint">@color/system_surface_tint_dark</color> + <color name="materialColorSurfaceVariant">@color/system_surface_variant_dark</color> + <color name="materialColorTertiary">@color/system_tertiary_dark</color> + <color name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</color> + <color name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</color> + <color name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</color> + <color name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</color> + <color name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</color> + <color name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</color> + <color name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</color> + <color name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</color> + <color name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</color> + <color name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</color> + <color name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</color> + <color name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</color> + <color name="materialColorPrimaryFixed">@color/system_primary_fixed</color> + <color name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</color> + <color name="materialColorSecondaryFixed">@color/system_secondary_fixed</color> + <color name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</color> + <color name="materialColorTertiaryFixed">@color/system_tertiary_fixed</color> + <color name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</color> + <color name="customColorBrandA">@color/system_brand_a_dark</color> + <color name="customColorBrandB">@color/system_brand_b_dark</color> + <color name="customColorBrandC">@color/system_brand_c_dark</color> + <color name="customColorBrandD">@color/system_brand_d_dark</color> + <color name="customColorClockHour">@color/system_clock_hour_dark</color> + <color name="customColorClockMinute">@color/system_clock_minute_dark</color> + <color name="customColorClockSecond">@color/system_clock_second_dark</color> + <color name="customColorOnShadeActive">@color/system_on_shade_active_dark</color> + <color name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</color> + <color name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</color> + <color name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</color> + <color name="customColorOnThemeApp">@color/system_on_theme_app_dark</color> + <color name="customColorOverviewBackground">@color/system_overview_background_dark</color> + <color name="customColorShadeActive">@color/system_shade_active_dark</color> + <color name="customColorShadeDisabled">@color/system_shade_disabled_dark</color> + <color name="customColorShadeInactive">@color/system_shade_inactive_dark</color> + <color name="customColorThemeApp">@color/system_theme_app_dark</color> + <color name="customColorThemeAppRing">@color/system_theme_app_ring_dark</color> + <color name="customColorThemeNotif">@color/system_theme_notif_dark</color> + <color name="customColorUnderSurface">@color/system_under_surface_dark</color> + <color name="customColorWeatherTemp">@color/system_weather_temp_dark</color> + <color name="customColorWidgetBackground">@color/system_widget_background_dark</color> +</resources> diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml index 4d2085bbe0c7..7ac17595a278 100644 --- a/core/res/res/values-watch/themes_device_defaults.xml +++ b/core/res/res/values-watch/themes_device_defaults.xml @@ -238,16 +238,16 @@ a similar way. <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> + <item name="materialColorInverseOnSurface">@color/system_on_surface_light</item> <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> + <item name="materialColorInversePrimary">@color/system_primary_light</item> <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> + <item name="materialColorInverseSurface">@color/system_surface_light</item> <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e6dedce8feaf..f663fb93cbcb 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1218,155 +1218,132 @@ it prevent any 'false' in any of its children. --> <attr name="forceDarkAllowed" format="boolean" /> - <!-- A lower-emphasized variant of the color on the fixed secondary branding color. @hide - --> - <attr name="materialColorOnSecondaryFixedVariant" format="color"/> - <!-- A lower-emphasized variant of the color on the fixed tertiary branding color. @hide - --> - <attr name="materialColorOnTertiaryFixedVariant" format="color"/> - <!-- The container color of surface the most lowered. @hide --> - <attr name="materialColorSurfaceContainerLowest" format="color"/> - <!-- A lower-emphasized variant of the color on the fixed primary branding color. @hide --> - <attr name="materialColorOnPrimaryFixedVariant" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - the secondary container color. @hide --> - <attr name="materialColorOnSecondaryContainer" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - the tertiary container color. @hide --> - <attr name="materialColorOnTertiaryContainer" format="color"/> - <!-- The container color of surface slightly lowered, which replaces the previous surface - at elevation level 1. @hide --> - <attr name="materialColorSurfaceContainerLow" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - the primary container color. @hide --> - <attr name="materialColorOnPrimaryContainer" format="color"/> - <!-- A stronger, more emphasized variant of the fixed secondary branding color. @hide --> - <attr name="materialColorSecondaryFixedDim" format="color"/> - <!-- A tonal variation of the on error color that passes accessibility guidelines for - text/iconography when drawn on top of error container. @hide --> - <attr name="materialColorOnErrorContainer" format="color"/> - <!-- The color text/iconography when drawn on top of the fixed secondary branding color. - @hide --> - <attr name="materialColorOnSecondaryFixed" format="color"/> - <!-- The "on surface" inverse color, useful for inverted backgrounds. @hide --> - <attr name="materialColorOnSurfaceInverse" format="color"/> - <!-- A stronger, more emphasized variant of the fixed tertiary branding color. @hide --> - <attr name="materialColorTertiaryFixedDim" format="color"/> - <!-- The color text/iconography when drawn on top of the fixed tertiary branding color. - @hide --> - <attr name="materialColorOnTertiaryFixed" format="color"/> - <!-- A stronger, more emphasized variant of the fixed primary branding color. @hide --> - <attr name="materialColorPrimaryFixedDim" format="color"/> - <!-- A tonal variation of the secondary color suitable for background color of container - views. @hide --> - <attr name="materialColorSecondaryContainer" format="color"/> - <!-- A tonal variation of the error color suitable for background color of container views. - @hide --> + <!-- Dynamic Tokens --> + + <!-- @hide --> + <attr name="materialColorBackground" format="color"/> + <!-- @hide --> + <attr name="materialColorControlActivated" format="color"/> + <!-- @hide --> + <attr name="materialColorControlHighlight" format="color"/> + <!-- @hide --> + <attr name="materialColorControlNormal" format="color"/> + <!-- @hide --> + <attr name="materialColorError" format="color"/> + <!-- @hide --> <attr name="materialColorErrorContainer" format="color"/> - <!-- The color text/iconography when drawn on top of the fixed primary branding color. - @hide --> - <attr name="materialColorOnPrimaryFixed" format="color"/> - <!-- The inverse color of colorPrimary. @hide --> - <attr name="materialColorPrimaryInverse" format="color"/> - <!-- A secondary branding color for the app, which stays the same between light and dark - themes. @hide --> - <attr name="materialColorSecondaryFixed" format="color"/> - <!-- The surface inverse color, useful for inverted backgrounds. @hide --> - <attr name="materialColorSurfaceInverse" format="color"/> - <!-- A tonal variation of the surface color. @hide --> - <attr name="materialColorSurfaceVariant" format="color"/> - <!-- A tonal variation of the tertiary color suitable for background color of container - views. @hide --> - <attr name="materialColorTertiaryContainer" format="color"/> - <!-- A tertiary branding color for the app, which stays the same between light and dark - themes. @hide --> - <attr name="materialColorTertiaryFixed" format="color"/> - <!-- A tonal variation of the primary color suitable for background color of container - views. @hide --> - <attr name="materialColorPrimaryContainer" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - background. @hide --> + <!-- @hide --> + <attr name="materialColorInverseOnSurface" format="color"/> + <!-- @hide --> + <attr name="materialColorInversePrimary" format="color"/> + <!-- @hide --> + <attr name="materialColorInverseSurface" format="color"/> + <!-- @hide --> <attr name="materialColorOnBackground" format="color"/> - <!-- A primary branding color for the app, which stays the same between light and dark - themes. @hide --> - <attr name="materialColorPrimaryFixed" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - secondary. @hide --> - <attr name="materialColorOnSecondary" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - tertiary. @hide --> - <attr name="materialColorOnTertiary" format="color"/> - <!-- The surface color which always stay the dimmest in either dark or light theme. @hide - --> - <attr name="materialColorSurfaceDim" format="color"/> - <!-- The surface color which always stay the brightest in either dark or light theme. @hide - --> - <attr name="materialColorSurfaceBright" format="color"/> - <!-- The secondary branding color for the app, usually a bright complement to the primary - branding color. @hide --> - <attr name="materialColorSecondary" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - error. @hide --> + <!-- @hide --> <attr name="materialColorOnError" format="color"/> - <!-- The color of surfaces such as cards, sheets, menus. @hide --> - <attr name="materialColorSurface" format="color"/> - <!-- The container color of surface slightly elevated, which replaces the previous surface - at elevation level 3. @hide --> - <attr name="materialColorSurfaceContainerHigh" format="color"/> - <!-- The tertiary branding color for the app, usually a bright complement to the primary - branding color. @hide --> - <attr name="materialColorTertiary" format="color"/> - <!-- The container color of surface the most elevated, which replaces the previous surface - variant. @hide --> - <attr name="materialColorSurfaceContainerHighest" format="color"/> - <!-- A tonal variation of the on surface color that passes accessibility guidelines for - text/iconography when drawn on top of surface variant. @hide --> + <!-- @hide --> + <attr name="materialColorOnErrorContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorOnPrimary" format="color"/> + <!-- @hide --> + <attr name="materialColorOnPrimaryContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorOnSecondary" format="color"/> + <!-- @hide --> + <attr name="materialColorOnSecondaryContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorOnSurface" format="color"/> + <!-- @hide --> <attr name="materialColorOnSurfaceVariant" format="color"/> - <!-- A color meant to be used in element outlines. @hide --> + <!-- @hide --> + <attr name="materialColorOnTertiary" format="color"/> + <!-- @hide --> + <attr name="materialColorOnTertiaryContainer" format="color"/> + <!-- @hide --> <attr name="materialColorOutline" format="color"/> - <!-- A color meant to be used in element outlines on the surface-variant color. @hide --> + <!-- @hide --> <attr name="materialColorOutlineVariant" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - primary. @hide --> - <attr name="materialColorOnPrimary" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top of - surface. @hide --> - <attr name="materialColorOnSurface" format="color"/> - <!-- The container color of surface, which replaces the previous surface at elevation level - 2. @hide --> - <attr name="materialColorSurfaceContainer" format="color"/> - <!-- The container color of surface, which replaces the previous surface at elevation level - 2. @hide --> - <attr name="materialColorSurfaceContainer" format="color"/> - <!-- The primary branding color for the app. By default, this is the color applied to the - action bar background. @hide --> + <!-- @hide --> + <attr name="materialColorPaletteKeyColorNeutral" format="color"/> + <!-- @hide --> + <attr name="materialColorPaletteKeyColorNeutralVariant" format="color"/> + <!-- @hide --> + <attr name="materialColorPaletteKeyColorPrimary" format="color"/> + <!-- @hide --> + <attr name="materialColorPaletteKeyColorSecondary" format="color"/> + <!-- @hide --> + <attr name="materialColorPaletteKeyColorTertiary" format="color"/> + <!-- @hide --> <attr name="materialColorPrimary" format="color"/> - <!-- The secondary branding color for the app, usually a bright complement to the primary - branding color. @hide --> + <!-- @hide --> + <attr name="materialColorPrimaryContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorScrim" format="color"/> + <!-- @hide --> <attr name="materialColorSecondary" format="color"/> - <!-- A color that passes accessibility guidelines for text/iconography when drawn on top - of tertiary. @hide --> + <!-- @hide --> + <attr name="materialColorSecondaryContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorShadow" format="color"/> + <!-- @hide --> + <attr name="materialColorSurface" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceBright" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceContainer" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceContainerHigh" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceContainerHighest" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceContainerLow" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceContainerLowest" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceDim" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceTint" format="color"/> + <!-- @hide --> + <attr name="materialColorSurfaceVariant" format="color"/> + <!-- @hide --> <attr name="materialColorTertiary" format="color"/> - <!-- The error color for the app, intended to draw attention to error conditions. @hide --> - <attr name="materialColorError" format="color"/> - - <!-- System Custom Tokens--> <!-- @hide --> - <attr name="customColorWidgetBackground" format="color"/> + <attr name="materialColorTertiaryContainer" format="color"/> <!-- @hide --> - <attr name="customColorClockHour" format="color"/> + <attr name="materialColorTextHintInverse" format="color"/> <!-- @hide --> - <attr name="customColorClockMinute" format="color"/> + <attr name="materialColorTextPrimaryInverse" format="color"/> <!-- @hide --> - <attr name="customColorClockSecond" format="color"/> + <attr name="materialColorTextPrimaryInverseDisableOnly" format="color"/> <!-- @hide --> - <attr name="customColorThemeApp" format="color"/> + <attr name="materialColorTextSecondaryAndTertiaryInverse" format="color"/> <!-- @hide --> - <attr name="customColorOnThemeApp" format="color"/> + <attr name="materialColorTextSecondaryAndTertiaryInverseDisabled" format="color"/> <!-- @hide --> - <attr name="customColorThemeAppRing" format="color"/> + <attr name="materialColorOnPrimaryFixed" format="color"/> <!-- @hide --> - <attr name="customColorThemeNotif" format="color"/> + <attr name="materialColorOnPrimaryFixedVariant" format="color"/> + <!-- @hide --> + <attr name="materialColorOnSecondaryFixed" format="color"/> + <!-- @hide --> + <attr name="materialColorOnSecondaryFixedVariant" format="color"/> + <!-- @hide --> + <attr name="materialColorOnTertiaryFixed" format="color"/> + <!-- @hide --> + <attr name="materialColorOnTertiaryFixedVariant" format="color"/> + <!-- @hide --> + <attr name="materialColorPrimaryFixed" format="color"/> + <!-- @hide --> + <attr name="materialColorPrimaryFixedDim" format="color"/> + <!-- @hide --> + <attr name="materialColorSecondaryFixed" format="color"/> + <!-- @hide --> + <attr name="materialColorSecondaryFixedDim" format="color"/> + <!-- @hide --> + <attr name="materialColorTertiaryFixed" format="color"/> + <!-- @hide --> + <attr name="materialColorTertiaryFixedDim" format="color"/> <!-- @hide --> <attr name="customColorBrandA" format="color"/> <!-- @hide --> @@ -1376,23 +1353,41 @@ <!-- @hide --> <attr name="customColorBrandD" format="color"/> <!-- @hide --> - <attr name="customColorUnderSurface" format="color"/> + <attr name="customColorClockHour" format="color"/> <!-- @hide --> - <attr name="customColorShadeActive" format="color"/> + <attr name="customColorClockMinute" format="color"/> + <!-- @hide --> + <attr name="customColorClockSecond" format="color"/> <!-- @hide --> <attr name="customColorOnShadeActive" format="color"/> <!-- @hide --> <attr name="customColorOnShadeActiveVariant" format="color"/> <!-- @hide --> - <attr name="customColorShadeInactive" format="color"/> - <!-- @hide --> <attr name="customColorOnShadeInactive" format="color"/> <!-- @hide --> <attr name="customColorOnShadeInactiveVariant" format="color"/> <!-- @hide --> - <attr name="customColorShadeDisabled" format="color"/> + <attr name="customColorOnThemeApp" format="color"/> <!-- @hide --> <attr name="customColorOverviewBackground" format="color"/> + <!-- @hide --> + <attr name="customColorShadeActive" format="color"/> + <!-- @hide --> + <attr name="customColorShadeDisabled" format="color"/> + <!-- @hide --> + <attr name="customColorShadeInactive" format="color"/> + <!-- @hide --> + <attr name="customColorThemeApp" format="color"/> + <!-- @hide --> + <attr name="customColorThemeAppRing" format="color"/> + <!-- @hide --> + <attr name="customColorThemeNotif" format="color"/> + <!-- @hide --> + <attr name="customColorUnderSurface" format="color"/> + <!-- @hide --> + <attr name="customColorWeatherTemp" format="color"/> + <!-- @hide --> + <attr name="customColorWidgetBackground" format="color"/> </declare-styleable> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index f5bb554b0b32..13dd4a35564c 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -238,393 +238,319 @@ <color name="conversation_important_highlight">#F9AB00</color> - <!--Lightest shade of the Primary color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Lightest shade of the Primary color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_0">#FFFFFF</color> - <!--Shade of the Primary system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_10">#FEFBFF</color> - <!--Shade of the Primary system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_50">#EEF0FF</color> - <!--Shade of the Primary system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_100">#D9E2FF</color> - <!--Shade of the Primary system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_200">#B0C6FF</color> - <!--Shade of the Primary system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_300">#94AAE4</color> - <!--Shade of the Primary system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_400">#7A90C8</color> - <!--Shade of the Primary system color at 50% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_500">#6076AC</color> - <!--Shade of the Primary system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_600">#475D92</color> - <!--Shade of the Primary system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_700">#2F4578</color> - <!--Shade of the Primary system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_800">#152E60</color> - <!--Shade of the Primary system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Primary system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_900">#001945</color> - <!--Darkest shade of the Primary color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Darkest shade of the Primary color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent1_1000">#000000</color> - - <!--Lightest shade of the Secondary color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Lightest shade of the Secondary color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_0">#FFFFFF</color> - <!--Shade of the Secondary system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_10">#FEFBFF</color> - <!--Shade of the Secondary system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_50">#EEF0FF</color> - <!--Shade of the Secondary system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_100">#DCE2F9</color> - <!--Shade of the Secondary system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_200">#C0C6DC</color> - <!--Shade of the Secondary system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_300">#A4ABC1</color> - <!--Shade of the Secondary system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_400">#8A90A5</color> - <!--Shade of the Secondary system color at 50% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_500">#70778B</color> - <!--Shade of the Secondary system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_600">#575E71</color> - <!--Shade of the Secondary system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_700">#404659</color> - <!--Shade of the Secondary system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_800">#2A3042</color> - <!--Shade of the Secondary system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_900">#151B2C</color> - <!--Darkest shade of the Secondary color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Darkest shade of the Secondary color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent2_1000">#000000</color> - - <!--Lightest shade of the Tertiary color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Lightest shade of the Tertiary color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_0">#FFFFFF</color> - <!--Shade of the Tertiary system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_10">#FFFBFF</color> - <!--Shade of the Tertiary system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_50">#FFEBFA</color> - <!--Shade of the Tertiary system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_100">#FDD7FA</color> - <!--Shade of the Tertiary system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_200">#E0BBDD</color> - <!--Shade of the Tertiary system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_300">#C3A0C1</color> - <!--Shade of the Tertiary system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_400">#A886A6</color> - <!--Shade of the Tertiary system color at 50% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_500">#8C6D8C</color> - <!--Shade of the Tertiary system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_600">#725572</color> - <!--Shade of the Tertiary system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_700">#593D59</color> - <!--Shade of the Tertiary system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_800">#412742</color> - <!--Shade of the Tertiary system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Tertiary system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_900">#2A122C</color> - <!--Darkest shade of the Tertiary color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Darkest shade of the Tertiary color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_accent3_1000">#000000</color> - - <!--Lightest shade of the Neutral color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Lightest shade of the Neutral color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_0">#FFFFFF</color> - <!--Shade of the Neutral system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_10">#FEFBFF</color> - <!--Shade of the Neutral system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_50">#F1F0F7</color> - <!--Shade of the Neutral system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_100">#E2E2E9</color> - <!--Shade of the Neutral system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_200">#C6C6CD</color> - <!--Shade of the Neutral system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_300">#ABABB1</color> - <!--Shade of the Neutral system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_400">#909097</color> - <!--Shade of the Neutral system color at 50% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_500">#76777D</color> - <!--Shade of the Neutral system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_600">#5D5E64</color> - <!--Shade of the Neutral system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_700">#45464C</color> - <!--Shade of the Neutral system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_800">#2F3036</color> - <!--Shade of the Neutral system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Neutral system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_900">#1A1B20</color> - <!--Darkest shade of the Neutral color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Darkest shade of the Neutral color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral1_1000">#000000</color> - - <!--Lightest shade of the Secondary Neutral color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Lightest shade of the Secondary Neutral color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_0">#FFFFFF</color> - <!--Shade of the Secondary Neutral system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_10">#FEFBFF</color> - <!--Shade of the Secondary Neutral system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_50">#F0F0FA</color> - <!--Shade of the Secondary Neutral system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_100">#E1E2EC</color> - <!--Shade of the Secondary Neutral system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_200">#C5C6D0</color> - <!--Shade of the Secondary Neutral system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_300">#A9ABB4</color> - <!--Shade of the Secondary Neutral system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_400">#8F9099</color> - <!--Shade of the Secondary Neutral system color at 50% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_500">#757780</color> - <!--Shade of the Secondary Neutral system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_600">#5C5E67</color> - <!--Shade of the Secondary Neutral system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_700">#44464F</color> - <!--Shade of the Secondary Neutral system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_800">#2E3038</color> - <!--Shade of the Secondary Neutral system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Shade of the Secondary Neutral system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_900">#191B23</color> - <!--Darkest shade of the Secondary Neutral color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs.--> + <!--Darkest shade of the Secondary Neutral color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_neutral2_1000">#000000</color> - - <!-- Lightest shade of the error color used by the system. White. - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_0">#ffffff</color> - <!-- Shade of the error system color at 99% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_10">#FFFBF9</color> - <!-- Shade of the error system color at 95% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_50">#FCEEEE</color> - <!-- Shade of the error system color at 90% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_100">#F9DEDC</color> - <!-- Shade of the error system color at 80% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_200">#F2B8B5</color> - <!-- Shade of the error system color at 70% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_300">#EC928E</color> - <!-- Shade of the error system color at 60% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_400">#E46962</color> - <!-- Shade of the error system color at 49% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_500">#DC362E</color> - <!-- Shade of the error system color at 40% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_600">#B3261E</color> - <!-- Shade of the error system color at 30% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_700">#8C1D18</color> - <!-- Shade of the error system color at 20% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_800">#601410</color> - <!-- Shade of the error system color at 10% perceptual luminance (L* in L*a*b* color space). - This value can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_error_900">#410E0B</color> - <!-- Darkest shade of the error color used by the system. Black. - This value can be overlaid at runtime by OverlayManager RROs. --> + <!--Lightest shade of the Error color used by the system. White. This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_0">#FFFFFF</color> + <!--Shade of the Error system color at 99% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_10">#FFFBFF</color> + <!--Shade of the Error system color at 95% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_50">#FFEDEA</color> + <!--Shade of the Error system color at 90% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_100">#FFDAD6</color> + <!--Shade of the Error system color at 80% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_200">#FFB4AB</color> + <!--Shade of the Error system color at 70% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_300">#FF897D</color> + <!--Shade of the Error system color at 60% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_400">#FF5449</color> + <!--Shade of the Error system color at 50% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_500">#DE3730</color> + <!--Shade of the Error system color at 40% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_600">#BA1A1A</color> + <!--Shade of the Error system color at 30% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_700">#93000A</color> + <!--Shade of the Error system color at 20% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_800">#690005</color> + <!--Shade of the Error system color at 10% perceptual luminance (L* in L*a*b* color space). This value can be overlaid at runtime by OverlayManager RROs.--> + <color name="system_error_900">#410002</color> + <!--Darkest shade of the Error color used by the system. Black. This value can be overlaid at runtime by OverlayManager RROs.--> <color name="system_error_1000">#000000</color> - <!-- Colors used in Android system, from design system. - These values can be overlaid at runtime by OverlayManager RROs. --> - <color name="system_primary_container_light">#D9E2FF</color> - <color name="system_on_primary_container_light">#001945</color> - <color name="system_primary_light">#475D92</color> + <!--Colors used in Android system, from design system. These values can be overlaid at runtime by OverlayManager RROs.--><color name="system_background_light">#FAF8FF</color> + <color name="system_control_activated_light">#D9E2FF</color> + <color name="system_control_highlight_light">#000000</color> + <color name="system_control_normal_light">#44464F</color> + <color name="system_error_light">#BA1A1A</color> + <color name="system_error_container_light">#FFDAD6</color> + <color name="system_inverse_on_surface_light">#F1F0F7</color> + <color name="system_inverse_primary_light">#B0C6FF</color> + <color name="system_inverse_surface_light">#2F3036</color> + <color name="system_on_background_light">#1A1B20</color> + <color name="system_on_error_light">#FFFFFF</color> + <color name="system_on_error_container_light">#93000A</color> <color name="system_on_primary_light">#FFFFFF</color> - <color name="system_secondary_container_light">#DCE2F9</color> - <color name="system_on_secondary_container_light">#151B2C</color> - <color name="system_secondary_light">#575E71</color> + <color name="system_on_primary_container_light">#2F4578</color> <color name="system_on_secondary_light">#FFFFFF</color> - <color name="system_tertiary_container_light">#FDD7FA</color> - <color name="system_on_tertiary_container_light">#2A122C</color> - <color name="system_tertiary_light">#725572</color> + <color name="system_on_secondary_container_light">#404659</color> + <color name="system_on_surface_light">#1A1B20</color> + <color name="system_on_surface_variant_light">#44464F</color> <color name="system_on_tertiary_light">#FFFFFF</color> - <color name="system_background_light">#FAF8FF</color> - <color name="system_on_background_light">#1A1B20</color> + <color name="system_on_tertiary_container_light">#593D59</color> + <color name="system_outline_light">#757780</color> + <color name="system_outline_variant_light">#C5C6D0</color> + <color name="system_palette_key_color_neutral_light">#76777D</color> + <color name="system_palette_key_color_neutral_variant_light">#757780</color> + <color name="system_palette_key_color_primary_light">#6076AC</color> + <color name="system_palette_key_color_secondary_light">#70778B</color> + <color name="system_palette_key_color_tertiary_light">#8C6D8C</color> + <color name="system_primary_light">#475D92</color> + <color name="system_primary_container_light">#D9E2FF</color> + <color name="system_scrim_light">#000000</color> + <color name="system_secondary_light">#575E71</color> + <color name="system_secondary_container_light">#DCE2F9</color> + <color name="system_shadow_light">#000000</color> <color name="system_surface_light">#FAF8FF</color> - <color name="system_on_surface_light">#1A1B20</color> - <color name="system_surface_container_low_light">#F4F3FA</color> - <color name="system_surface_container_lowest_light">#FFFFFF</color> + <color name="system_surface_bright_light">#FAF8FF</color> <color name="system_surface_container_light">#EEEDF4</color> <color name="system_surface_container_high_light">#E8E7EF</color> <color name="system_surface_container_highest_light">#E2E2E9</color> - <color name="system_surface_bright_light">#FAF8FF</color> + <color name="system_surface_container_low_light">#F4F3FA</color> + <color name="system_surface_container_lowest_light">#FFFFFF</color> <color name="system_surface_dim_light">#DAD9E0</color> + <color name="system_surface_tint_light">#475D92</color> <color name="system_surface_variant_light">#E1E2EC</color> - <color name="system_on_surface_variant_light">#44464F</color> - <color name="system_outline_light">#757780</color> - <color name="system_outline_variant_light">#C5C6D0</color> - <color name="system_error_light">#BA1A1A</color> - <color name="system_on_error_light">#FFFFFF</color> - <color name="system_error_container_light">#FFDAD6</color> - <color name="system_on_error_container_light">#410002</color> - <color name="system_control_activated_light">#D9E2FF</color> - <color name="system_control_normal_light">#44464F</color> - <color name="system_control_highlight_light">#000000</color> -<color name="system_text_primary_inverse_light">#E2E2E9</color> - <color name="system_text_secondary_and_tertiary_inverse_light">#C5C6D0</color> + <color name="system_tertiary_light">#725572</color> + <color name="system_tertiary_container_light">#FDD7FA</color> + <color name="system_text_hint_inverse_light">#E2E2E9</color> + <color name="system_text_primary_inverse_light">#E2E2E9</color> <color name="system_text_primary_inverse_disable_only_light">#E2E2E9</color> + <color name="system_text_secondary_and_tertiary_inverse_light">#C5C6D0</color> <color name="system_text_secondary_and_tertiary_inverse_disabled_light">#E2E2E9</color> - <color name="system_text_hint_inverse_light">#E2E2E9</color> - <color name="system_palette_key_color_primary_light">#6076AC</color> - <color name="system_palette_key_color_secondary_light">#70778B</color> - <color name="system_palette_key_color_tertiary_light">#8C6D8C</color> - <color name="system_palette_key_color_neutral_light">#76777D</color> - <color name="system_palette_key_color_neutral_variant_light">#757780</color> - <color name="system_primary_container_dark">#2F4578</color> - <color name="system_on_primary_container_dark">#D9E2FF</color> - <color name="system_primary_dark">#B0C6FF</color> + <color name="system_background_dark">#121318</color> + <color name="system_control_activated_dark">#2F4578</color> + <color name="system_control_highlight_dark">#FFFFFF</color> + <color name="system_control_normal_dark">#C5C6D0</color> + <color name="system_error_dark">#FFB4AB</color> + <color name="system_error_container_dark">#93000A</color> + <color name="system_inverse_on_surface_dark">#2F3036</color> + <color name="system_inverse_primary_dark">#475D92</color> + <color name="system_inverse_surface_dark">#E2E2E9</color> + <color name="system_on_background_dark">#E2E2E9</color> + <color name="system_on_error_dark">#690005</color> + <color name="system_on_error_container_dark">#FFDAD6</color> <color name="system_on_primary_dark">#152E60</color> - <color name="system_secondary_container_dark">#404659</color> - <color name="system_on_secondary_container_dark">#DCE2F9</color> - <color name="system_secondary_dark">#C0C6DC</color> + <color name="system_on_primary_container_dark">#D9E2FF</color> <color name="system_on_secondary_dark">#2A3042</color> - <color name="system_tertiary_container_dark">#593D59</color> - <color name="system_on_tertiary_container_dark">#FDD7FA</color> - <color name="system_tertiary_dark">#E0BBDD</color> + <color name="system_on_secondary_container_dark">#DCE2F9</color> + <color name="system_on_surface_dark">#E2E2E9</color> + <color name="system_on_surface_variant_dark">#C5C6D0</color> <color name="system_on_tertiary_dark">#412742</color> - <color name="system_background_dark">#121318</color> - <color name="system_on_background_dark">#E2E2E9</color> + <color name="system_on_tertiary_container_dark">#FDD7FA</color> + <color name="system_outline_dark">#8F9099</color> + <color name="system_outline_variant_dark">#44464F</color> + <color name="system_palette_key_color_neutral_dark">#76777D</color> + <color name="system_palette_key_color_neutral_variant_dark">#757780</color> + <color name="system_palette_key_color_primary_dark">#6076AC</color> + <color name="system_palette_key_color_secondary_dark">#70778B</color> + <color name="system_palette_key_color_tertiary_dark">#8C6D8C</color> + <color name="system_primary_dark">#B0C6FF</color> + <color name="system_primary_container_dark">#2F4578</color> + <color name="system_scrim_dark">#000000</color> + <color name="system_secondary_dark">#C0C6DC</color> + <color name="system_secondary_container_dark">#404659</color> + <color name="system_shadow_dark">#000000</color> <color name="system_surface_dark">#121318</color> - <color name="system_on_surface_dark">#E2E2E9</color> - <color name="system_surface_container_low_dark">#1A1B20</color> - <color name="system_surface_container_lowest_dark">#0C0E13</color> + <color name="system_surface_bright_dark">#38393F</color> <color name="system_surface_container_dark">#1E1F25</color> <color name="system_surface_container_high_dark">#282A2F</color> <color name="system_surface_container_highest_dark">#33343A</color> - <color name="system_surface_bright_dark">#38393F</color> + <color name="system_surface_container_low_dark">#1A1B20</color> + <color name="system_surface_container_lowest_dark">#0C0E13</color> <color name="system_surface_dim_dark">#121318</color> + <color name="system_surface_tint_dark">#B0C6FF</color> <color name="system_surface_variant_dark">#44464F</color> - <color name="system_on_surface_variant_dark">#C5C6D0</color> - <color name="system_outline_dark">#8F9099</color> - <color name="system_outline_variant_dark">#44464F</color> - <color name="system_error_dark">#FFB4AB</color> - <color name="system_on_error_dark">#690005</color> - <color name="system_error_container_dark">#93000A</color> - <color name="system_on_error_container_dark">#FFDAD6</color> - <color name="system_control_activated_dark">#2F4578</color> - <color name="system_control_normal_dark">#C5C6D0</color> - <color name="system_control_highlight_dark">#FFFFFF</color> + <color name="system_tertiary_dark">#E0BBDD</color> + <color name="system_tertiary_container_dark">#593D59</color> + <color name="system_text_hint_inverse_dark">#1A1B20</color> <color name="system_text_primary_inverse_dark">#1A1B20</color> - <color name="system_text_secondary_and_tertiary_inverse_dark">#44464F</color> <color name="system_text_primary_inverse_disable_only_dark">#1A1B20</color> + <color name="system_text_secondary_and_tertiary_inverse_dark">#44464F</color> <color name="system_text_secondary_and_tertiary_inverse_disabled_dark">#1A1B20</color> - <color name="system_text_hint_inverse_dark">#1A1B20</color> - <color name="system_palette_key_color_primary_dark">#6076AC</color> - <color name="system_palette_key_color_secondary_dark">#70778B</color> - <color name="system_palette_key_color_tertiary_dark">#8C6D8C</color> - <color name="system_palette_key_color_neutral_dark">#76777D</color> - <color name="system_palette_key_color_neutral_variant_dark">#757780</color> - <color name="system_primary_fixed">#D9E2FF</color> - <color name="system_primary_fixed_dim">#B0C6FF</color> <color name="system_on_primary_fixed">#001945</color> <color name="system_on_primary_fixed_variant">#2F4578</color> - <color name="system_secondary_fixed">#DCE2F9</color> - <color name="system_secondary_fixed_dim">#C0C6DC</color> <color name="system_on_secondary_fixed">#151B2C</color> <color name="system_on_secondary_fixed_variant">#404659</color> - <color name="system_tertiary_fixed">#FDD7FA</color> - <color name="system_tertiary_fixed_dim">#E0BBDD</color> <color name="system_on_tertiary_fixed">#2A122C</color> <color name="system_on_tertiary_fixed_variant">#593D59</color> - - <!--Colors used in Android system, from design system. These values can be overlaid at runtime - by OverlayManager RROs.--> - <color name="system_widget_background_light">#EEF0FF</color> - <color name="system_clock_hour_light">#373D50</color> - <color name="system_clock_minute_light">#3D5487</color> - <color name="system_clock_second_light">#4F659A</color> - <color name="system_theme_app_light">#D9E2FF</color> - <color name="system_on_theme_app_light">#475D92</color> - <color name="system_theme_app_ring_light">#94AAE4</color> - <color name="system_theme_notif_light">#E0BBDD</color> + <color name="system_primary_fixed">#D9E2FF</color> + <color name="system_primary_fixed_dim">#B0C6FF</color> + <color name="system_secondary_fixed">#DCE2F9</color> + <color name="system_secondary_fixed_dim">#C0C6DC</color> + <color name="system_tertiary_fixed">#FDD7FA</color> + <color name="system_tertiary_fixed_dim">#E0BBDD</color> <color name="system_brand_a_light">#475D92</color> <color name="system_brand_b_light">#6E7488</color> <color name="system_brand_c_light">#5E73A9</color> <color name="system_brand_d_light">#8A6A89</color> - <color name="system_under_surface_light">#000000</color> -<color name="system_shade_active_light">#D9E2FF</color> + <color name="system_clock_hour_light">#373D50</color> + <color name="system_clock_minute_light">#3D5487</color> + <color name="system_clock_second_light">#725572</color> <color name="system_on_shade_active_light">#152E60</color> <color name="system_on_shade_active_variant_light">#2F4578</color> - <color name="system_shade_inactive_light">#2F3036</color> <color name="system_on_shade_inactive_light">#E1E2EC</color> <color name="system_on_shade_inactive_variant_light">#C5C6D0</color> - <color name="system_shade_disabled_light">#0C0E13</color> + <color name="system_on_theme_app_light">#475D92</color> <color name="system_overview_background_light">#C5C6D0</color> - <color name="system_widget_background_dark">#152E60</color> - <color name="system_clock_hour_dark">#8A90A5</color> - <color name="system_clock_minute_dark">#D9E2FF</color> - <color name="system_clock_second_dark">#B0C6FF</color> - <color name="system_theme_app_dark">#2F4578</color> - <color name="system_on_theme_app_dark">#B0C6FF</color> - <color name="system_theme_app_ring_dark">#94AAE4</color> - <color name="system_theme_notif_dark">#FDD7FA</color> + <color name="system_shade_active_light">#D9E2FF</color> + <color name="system_shade_disabled_light">#0C0E13</color> + <color name="system_shade_inactive_light">#2F3036</color> + <color name="system_theme_app_light">#D9E2FF</color> + <color name="system_theme_app_ring_light">#94AAE4</color> + <color name="system_theme_notif_light">#E0BBDD</color> + <color name="system_under_surface_light">#000000</color> + <color name="system_weather_temp_light">#4F659A</color> + <color name="system_widget_background_light">#EEF0FF</color> <color name="system_brand_a_dark">#B0C6FF</color> <color name="system_brand_b_dark">#DCE2F9</color> <color name="system_brand_c_dark">#7A90C8</color> <color name="system_brand_d_dark">#FDD7FA</color> - <color name="system_under_surface_dark">#000000</color> -<color name="system_shade_active_dark">#D9E2FF</color> + <color name="system_clock_hour_dark">#8A90A5</color> + <color name="system_clock_minute_dark">#D9E2FF</color> + <color name="system_clock_second_dark">#FDD7FA</color> <color name="system_on_shade_active_dark">#001945</color> <color name="system_on_shade_active_variant_dark">#2F4578</color> - <color name="system_shade_inactive_dark">#2F3036</color> <color name="system_on_shade_inactive_dark">#E1E2EC</color> <color name="system_on_shade_inactive_variant_dark">#C5C6D0</color> - <color name="system_shade_disabled_dark">#0C0E13</color> + <color name="system_on_theme_app_dark">#B0C6FF</color> <color name="system_overview_background_dark">#50525A</color> + <color name="system_shade_active_dark">#D9E2FF</color> + <color name="system_shade_disabled_dark">#0C0E13</color> + <color name="system_shade_inactive_dark">#2F3036</color> + <color name="system_theme_app_dark">#2F4578</color> + <color name="system_theme_app_ring_dark">#94AAE4</color> + <color name="system_theme_notif_dark">#FDD7FA</color> + <color name="system_under_surface_dark">#000000</color> + <color name="system_weather_temp_dark">#B0C6FF</color> + <color name="system_widget_background_dark">#152E60</color> <!-- Accessibility shortcut icon background color --> <color name="accessibility_feature_background">#5F6368</color> <!-- Google grey 700 --> diff --git a/core/res/res/values/colors_dynamic.xml b/core/res/res/values/colors_dynamic.xml new file mode 100644 index 000000000000..ab283eb3c6c8 --- /dev/null +++ b/core/res/res/values/colors_dynamic.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Colors specific to Material themes. --> +<resources> + <color name="materialColorBackground">@color/system_background_light</color> + <color name="materialColorControlActivated">@color/system_control_activated_light</color> + <color name="materialColorControlHighlight">@color/system_control_highlight_light</color> + <color name="materialColorControlNormal">@color/system_control_normal_light</color> + <color name="materialColorError">@color/system_error_light</color> + <color name="materialColorErrorContainer">@color/system_error_container_light</color> + <color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</color> + <color name="materialColorInversePrimary">@color/system_inverse_primary_light</color> + <color name="materialColorInverseSurface">@color/system_inverse_surface_light</color> + <color name="materialColorOnBackground">@color/system_on_background_light</color> + <color name="materialColorOnError">@color/system_on_error_light</color> + <color name="materialColorOnErrorContainer">@color/system_on_error_container_light</color> + <color name="materialColorOnPrimary">@color/system_on_primary_light</color> + <color name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</color> + <color name="materialColorOnSecondary">@color/system_on_secondary_light</color> + <color name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</color> + <color name="materialColorOnSurface">@color/system_on_surface_light</color> + <color name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</color> + <color name="materialColorOnTertiary">@color/system_on_tertiary_light</color> + <color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</color> + <color name="materialColorOutline">@color/system_outline_light</color> + <color name="materialColorOutlineVariant">@color/system_outline_variant_light</color> + <color name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</color> + <color name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</color> + <color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</color> + <color name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</color> + <color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</color> + <color name="materialColorPrimary">@color/system_primary_light</color> + <color name="materialColorPrimaryContainer">@color/system_primary_container_light</color> + <color name="materialColorScrim">@color/system_scrim_light</color> + <color name="materialColorSecondary">@color/system_secondary_light</color> + <color name="materialColorSecondaryContainer">@color/system_secondary_container_light</color> + <color name="materialColorShadow">@color/system_shadow_light</color> + <color name="materialColorSurface">@color/system_surface_light</color> + <color name="materialColorSurfaceBright">@color/system_surface_bright_light</color> + <color name="materialColorSurfaceContainer">@color/system_surface_container_light</color> + <color name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</color> + <color name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</color> + <color name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</color> + <color name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</color> + <color name="materialColorSurfaceDim">@color/system_surface_dim_light</color> + <color name="materialColorSurfaceTint">@color/system_surface_tint_light</color> + <color name="materialColorSurfaceVariant">@color/system_surface_variant_light</color> + <color name="materialColorTertiary">@color/system_tertiary_light</color> + <color name="materialColorTertiaryContainer">@color/system_tertiary_container_light</color> + <color name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</color> + <color name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</color> + <color name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</color> + <color name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</color> + <color name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</color> + <color name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</color> + <color name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</color> + <color name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</color> + <color name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</color> + <color name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</color> + <color name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</color> + <color name="materialColorPrimaryFixed">@color/system_primary_fixed</color> + <color name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</color> + <color name="materialColorSecondaryFixed">@color/system_secondary_fixed</color> + <color name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</color> + <color name="materialColorTertiaryFixed">@color/system_tertiary_fixed</color> + <color name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</color> + <color name="customColorBrandA">@color/system_brand_a_light</color> + <color name="customColorBrandB">@color/system_brand_b_light</color> + <color name="customColorBrandC">@color/system_brand_c_light</color> + <color name="customColorBrandD">@color/system_brand_d_light</color> + <color name="customColorClockHour">@color/system_clock_hour_light</color> + <color name="customColorClockMinute">@color/system_clock_minute_light</color> + <color name="customColorClockSecond">@color/system_clock_second_light</color> + <color name="customColorOnShadeActive">@color/system_on_shade_active_light</color> + <color name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</color> + <color name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</color> + <color name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</color> + <color name="customColorOnThemeApp">@color/system_on_theme_app_light</color> + <color name="customColorOverviewBackground">@color/system_overview_background_light</color> + <color name="customColorShadeActive">@color/system_shade_active_light</color> + <color name="customColorShadeDisabled">@color/system_shade_disabled_light</color> + <color name="customColorShadeInactive">@color/system_shade_inactive_light</color> + <color name="customColorThemeApp">@color/system_theme_app_light</color> + <color name="customColorThemeAppRing">@color/system_theme_app_ring_light</color> + <color name="customColorThemeNotif">@color/system_theme_notif_light</color> + <color name="customColorUnderSurface">@color/system_under_surface_light</color> + <color name="customColorWeatherTemp">@color/system_weather_temp_light</color> + <color name="customColorWidgetBackground">@color/system_widget_background_light</color> +</resources> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index b6436d0b30a5..612c72fc73a1 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -146,6 +146,30 @@ </staging-public-group> <staging-public-group type="color" first-id="0x01b20000"> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_on_surface_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_primary_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_surface_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_scrim_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_shadow_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_surface_tint_light"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_on_surface_dark"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_primary_dark"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_inverse_surface_dark"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_scrim_dark"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_shadow_dark"/> + <!-- @FlaggedApi("com.android.systemui.material_colors_10_2024")--> + <public name="system_surface_tint_dark"/> </staging-public-group> <staging-public-group type="array" first-id="0x01b10000"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index badb98686fb2..c792153d1e6f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -5310,73 +5310,91 @@ <java-symbol type="integer" name="config_aggregatedPowerStatsSpanDuration" /> <java-symbol type="integer" name="config_accumulatedBatteryUsageStatsSpanSize" /> - <java-symbol name="materialColorOnSecondaryFixedVariant" type="attr"/> - <java-symbol name="materialColorOnTertiaryFixedVariant" type="attr"/> - <java-symbol name="materialColorSurfaceContainerLowest" type="attr"/> - <java-symbol name="materialColorOnPrimaryFixedVariant" type="attr"/> - <java-symbol name="materialColorOnSecondaryContainer" type="attr"/> - <java-symbol name="materialColorOnTertiaryContainer" type="attr"/> - <java-symbol name="materialColorSurfaceContainerLow" type="attr"/> - <java-symbol name="materialColorOnPrimaryContainer" type="attr"/> - <java-symbol name="materialColorSecondaryFixedDim" type="attr"/> - <java-symbol name="materialColorOnErrorContainer" type="attr"/> - <java-symbol name="materialColorOnSecondaryFixed" type="attr"/> - <java-symbol name="materialColorOnSurfaceInverse" type="attr"/> - <java-symbol name="materialColorTertiaryFixedDim" type="attr"/> - <java-symbol name="materialColorOnTertiaryFixed" type="attr"/> - <java-symbol name="materialColorPrimaryFixedDim" type="attr"/> - <java-symbol name="materialColorSecondaryContainer" type="attr"/> - <java-symbol name="materialColorErrorContainer" type="attr"/> - <java-symbol name="materialColorOnPrimaryFixed" type="attr"/> - <java-symbol name="materialColorPrimaryInverse" type="attr"/> - <java-symbol name="materialColorSecondaryFixed" type="attr"/> - <java-symbol name="materialColorSurfaceInverse" type="attr"/> - <java-symbol name="materialColorSurfaceVariant" type="attr"/> - <java-symbol name="materialColorTertiaryContainer" type="attr"/> - <java-symbol name="materialColorTertiaryFixed" type="attr"/> - <java-symbol name="materialColorPrimaryContainer" type="attr"/> - <java-symbol name="materialColorOnBackground" type="attr"/> - <java-symbol name="materialColorPrimaryFixed" type="attr"/> - <java-symbol name="materialColorOnSecondary" type="attr"/> - <java-symbol name="materialColorOnTertiary" type="attr"/> - <java-symbol name="materialColorSurfaceDim" type="attr"/> - <java-symbol name="materialColorSurfaceBright" type="attr"/> - <java-symbol name="materialColorOnError" type="attr"/> - <java-symbol name="materialColorSurface" type="attr"/> - <java-symbol name="materialColorSurfaceContainerHigh" type="attr"/> - <java-symbol name="materialColorSurfaceContainerHighest" type="attr"/> - <java-symbol name="materialColorOnSurfaceVariant" type="attr"/> - <java-symbol name="materialColorOutline" type="attr"/> - <java-symbol name="materialColorOutlineVariant" type="attr"/> - <java-symbol name="materialColorOnPrimary" type="attr"/> - <java-symbol name="materialColorOnSurface" type="attr"/> - <java-symbol name="materialColorSurfaceContainer" type="attr"/> - <java-symbol name="materialColorPrimary" type="attr"/> - <java-symbol name="materialColorSecondary" type="attr"/> - <java-symbol name="materialColorTertiary" type="attr"/> - <java-symbol name="materialColorError" type="attr"/> - - <java-symbol name="customColorWidgetBackground" type="attr"/> - <java-symbol name="customColorClockHour" type="attr"/> - <java-symbol name="customColorClockMinute" type="attr"/> - <java-symbol name="customColorClockSecond" type="attr"/> - <java-symbol name="customColorThemeApp" type="attr"/> - <java-symbol name="customColorOnThemeApp" type="attr"/> - <java-symbol name="customColorThemeAppRing" type="attr"/> - <java-symbol name="customColorThemeNotif" type="attr"/> - <java-symbol name="customColorBrandA" type="attr"/> - <java-symbol name="customColorBrandB" type="attr"/> - <java-symbol name="customColorBrandC" type="attr"/> - <java-symbol name="customColorBrandD" type="attr"/> - <java-symbol name="customColorUnderSurface" type="attr"/> - <java-symbol name="customColorShadeActive" type="attr"/> - <java-symbol name="customColorOnShadeActive" type="attr"/> - <java-symbol name="customColorOnShadeActiveVariant" type="attr"/> - <java-symbol name="customColorShadeInactive" type="attr"/> - <java-symbol name="customColorOnShadeInactive" type="attr"/> - <java-symbol name="customColorOnShadeInactiveVariant" type="attr"/> - <java-symbol name="customColorShadeDisabled" type="attr"/> - <java-symbol name="customColorOverviewBackground" type="attr"/> + <!--Dynamic Tokens--> + <java-symbol type="attr" name="materialColorBackground"/> + <java-symbol type="attr" name="materialColorControlActivated"/> + <java-symbol type="attr" name="materialColorControlHighlight"/> + <java-symbol type="attr" name="materialColorControlNormal"/> + <java-symbol type="attr" name="materialColorError"/> + <java-symbol type="attr" name="materialColorErrorContainer"/> + <java-symbol type="attr" name="materialColorInverseOnSurface"/> + <java-symbol type="attr" name="materialColorInversePrimary"/> + <java-symbol type="attr" name="materialColorInverseSurface"/> + <java-symbol type="attr" name="materialColorOnBackground"/> + <java-symbol type="attr" name="materialColorOnError"/> + <java-symbol type="attr" name="materialColorOnErrorContainer"/> + <java-symbol type="attr" name="materialColorOnPrimary"/> + <java-symbol type="attr" name="materialColorOnPrimaryContainer"/> + <java-symbol type="attr" name="materialColorOnSecondary"/> + <java-symbol type="attr" name="materialColorOnSecondaryContainer"/> + <java-symbol type="attr" name="materialColorOnSurface"/> + <java-symbol type="attr" name="materialColorOnSurfaceVariant"/> + <java-symbol type="attr" name="materialColorOnTertiary"/> + <java-symbol type="attr" name="materialColorOnTertiaryContainer"/> + <java-symbol type="attr" name="materialColorOutline"/> + <java-symbol type="attr" name="materialColorOutlineVariant"/> + <java-symbol type="attr" name="materialColorPaletteKeyColorNeutral"/> + <java-symbol type="attr" name="materialColorPaletteKeyColorNeutralVariant"/> + <java-symbol type="attr" name="materialColorPaletteKeyColorPrimary"/> + <java-symbol type="attr" name="materialColorPaletteKeyColorSecondary"/> + <java-symbol type="attr" name="materialColorPaletteKeyColorTertiary"/> + <java-symbol type="attr" name="materialColorPrimary"/> + <java-symbol type="attr" name="materialColorPrimaryContainer"/> + <java-symbol type="attr" name="materialColorScrim"/> + <java-symbol type="attr" name="materialColorSecondary"/> + <java-symbol type="attr" name="materialColorSecondaryContainer"/> + <java-symbol type="attr" name="materialColorShadow"/> + <java-symbol type="attr" name="materialColorSurface"/> + <java-symbol type="attr" name="materialColorSurfaceBright"/> + <java-symbol type="attr" name="materialColorSurfaceContainer"/> + <java-symbol type="attr" name="materialColorSurfaceContainerHigh"/> + <java-symbol type="attr" name="materialColorSurfaceContainerHighest"/> + <java-symbol type="attr" name="materialColorSurfaceContainerLow"/> + <java-symbol type="attr" name="materialColorSurfaceContainerLowest"/> + <java-symbol type="attr" name="materialColorSurfaceDim"/> + <java-symbol type="attr" name="materialColorSurfaceTint"/> + <java-symbol type="attr" name="materialColorSurfaceVariant"/> + <java-symbol type="attr" name="materialColorTertiary"/> + <java-symbol type="attr" name="materialColorTertiaryContainer"/> + <java-symbol type="attr" name="materialColorTextHintInverse"/> + <java-symbol type="attr" name="materialColorTextPrimaryInverse"/> + <java-symbol type="attr" name="materialColorTextPrimaryInverseDisableOnly"/> + <java-symbol type="attr" name="materialColorTextSecondaryAndTertiaryInverse"/> + <java-symbol type="attr" name="materialColorTextSecondaryAndTertiaryInverseDisabled"/> + <java-symbol type="attr" name="materialColorOnPrimaryFixed"/> + <java-symbol type="attr" name="materialColorOnPrimaryFixedVariant"/> + <java-symbol type="attr" name="materialColorOnSecondaryFixed"/> + <java-symbol type="attr" name="materialColorOnSecondaryFixedVariant"/> + <java-symbol type="attr" name="materialColorOnTertiaryFixed"/> + <java-symbol type="attr" name="materialColorOnTertiaryFixedVariant"/> + <java-symbol type="attr" name="materialColorPrimaryFixed"/> + <java-symbol type="attr" name="materialColorPrimaryFixedDim"/> + <java-symbol type="attr" name="materialColorSecondaryFixed"/> + <java-symbol type="attr" name="materialColorSecondaryFixedDim"/> + <java-symbol type="attr" name="materialColorTertiaryFixed"/> + <java-symbol type="attr" name="materialColorTertiaryFixedDim"/> + <java-symbol type="attr" name="customColorBrandA"/> + <java-symbol type="attr" name="customColorBrandB"/> + <java-symbol type="attr" name="customColorBrandC"/> + <java-symbol type="attr" name="customColorBrandD"/> + <java-symbol type="attr" name="customColorClockHour"/> + <java-symbol type="attr" name="customColorClockMinute"/> + <java-symbol type="attr" name="customColorClockSecond"/> + <java-symbol type="attr" name="customColorOnShadeActive"/> + <java-symbol type="attr" name="customColorOnShadeActiveVariant"/> + <java-symbol type="attr" name="customColorOnShadeInactive"/> + <java-symbol type="attr" name="customColorOnShadeInactiveVariant"/> + <java-symbol type="attr" name="customColorOnThemeApp"/> + <java-symbol type="attr" name="customColorOverviewBackground"/> + <java-symbol type="attr" name="customColorShadeActive"/> + <java-symbol type="attr" name="customColorShadeDisabled"/> + <java-symbol type="attr" name="customColorShadeInactive"/> + <java-symbol type="attr" name="customColorThemeApp"/> + <java-symbol type="attr" name="customColorThemeAppRing"/> + <java-symbol type="attr" name="customColorThemeNotif"/> + <java-symbol type="attr" name="customColorUnderSurface"/> + <java-symbol type="attr" name="customColorWeatherTemp"/> + <java-symbol type="attr" name="customColorWidgetBackground"/> <java-symbol name="system_widget_background_light" type="color"/> <java-symbol name="system_clock_hour_light" type="color"/> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 352c3904406c..d8346d87f624 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -239,73 +239,90 @@ easier. <item name="colorForeground">@color/foreground_device_default_dark</item> <item name="colorForegroundInverse">@color/foreground_device_default_light</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" /> @@ -357,73 +374,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar. This theme @@ -474,73 +508,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar and @@ -593,73 +644,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} that has no title bar and translucent @@ -711,73 +779,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for dialog windows and activities. This changes the window to be @@ -837,73 +922,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a @@ -954,73 +1056,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar --> @@ -1070,73 +1189,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Dialog_NoActionBar} that has a nice minimum width @@ -1187,73 +1323,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. --> @@ -1320,73 +1473,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for a window without an action bar that will be displayed either @@ -1438,73 +1608,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for a presentation window on a secondary display. --> @@ -1554,73 +1741,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for panel windows. This removes all extraneous window @@ -1672,73 +1876,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear @@ -1789,73 +2010,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear @@ -1906,73 +2144,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- DeviceDefault style for input methods, which is used by the @@ -2023,73 +2278,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault style for input methods, which is used by the @@ -2140,73 +2412,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> @@ -2257,73 +2546,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Theme for the dialog shown when an app crashes or ANRs. --> @@ -2379,73 +2685,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame"> @@ -2494,73 +2817,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <!-- Variant of {@link #Theme_DeviceDefault} with a light-colored style --> @@ -2747,73 +3087,90 @@ easier. <item name="colorPopupBackground">?attr/colorBackgroundFloating</item> <item name="panelColorBackground">?attr/colorBackgroundFloating</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an @@ -2864,73 +3221,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar --> @@ -2980,73 +3354,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar. @@ -3097,73 +3488,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar @@ -3216,73 +3624,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent @@ -3334,73 +3759,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be @@ -3458,73 +3900,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a @@ -3578,73 +4037,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar --> @@ -3697,73 +4173,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum @@ -3817,73 +4310,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. --> @@ -3918,73 +4428,90 @@ easier. <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. --> @@ -4019,73 +4546,90 @@ easier. <item name="colorForeground">@color/foreground_device_default_light</item> <item name="colorForegroundInverse">@color/foreground_device_default_dark</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller @@ -4139,73 +4683,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault light theme for a window without an action bar that will be displayed either @@ -4260,73 +4821,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault light theme for a presentation window on a secondary display. --> @@ -4379,73 +4957,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault light theme for panel windows. This removes all extraneous window @@ -4497,73 +5092,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.Alert"> @@ -4614,73 +5226,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="Theme.DeviceDefault.Light.Dialog.Alert" /> @@ -4731,73 +5360,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Light.Voice" parent="Theme.Material.Light.Voice"> @@ -4846,73 +5492,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- DeviceDefault theme for a window that should look like the Settings app. --> @@ -4968,74 +5631,90 @@ easier. <item name="colorListDivider">@color/list_divider_color_light</item> <item name="opacityListDivider">@color/list_divider_opacity_device_default_light</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.SystemUI" parent="Theme.DeviceDefault.Light"> @@ -5072,74 +5751,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.SystemUI.Dialog" parent="Theme.DeviceDefault.Light.Dialog"> @@ -5168,74 +5863,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar --> @@ -5286,73 +5997,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="Theme.DeviceDefault.Settings.DialogBase" parent="Theme.Material.Light.BaseDialog"> @@ -5387,73 +6115,90 @@ easier. <!-- Dialog attributes --> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog" parent="Theme.DeviceDefault.Settings.DialogBase"> @@ -5528,73 +6273,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.Alert"> @@ -5647,73 +6409,90 @@ easier. <!-- Toolbar attributes --> <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="Theme.DeviceDefault.Light.Dialog.NoActionBar" /> @@ -5792,73 +6571,90 @@ easier. <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> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="ThemeOverlay.DeviceDefault.Accent.Light"> @@ -5867,73 +6663,90 @@ easier. <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> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <!-- Theme overlay that replaces colorAccent with the colorAccent from {@link #Theme_DeviceDefault_DayNight}. --> @@ -5946,73 +6759,90 @@ easier. <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> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" parent="Theme.DeviceDefault.NoActionBar.Fullscreen"> @@ -6021,73 +6851,90 @@ easier. <item name="layout_gravity">center</item> <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_dark</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorBackground">@color/system_background_light</item> + <item name="materialColorControlActivated">@color/system_control_activated_light</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_light</item> + <item name="materialColorControlNormal">@color/system_control_normal_light</item> + <item name="materialColorError">@color/system_error_light</item> <item name="materialColorErrorContainer">@color/system_error_container_light</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_dark</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_dark</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_light</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_light</item> <item name="materialColorOnBackground">@color/system_on_background_light</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> <item name="materialColorOnError">@color/system_on_error_light</item> - <item name="materialColorSurface">@color/system_surface_light</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item> + <item name="materialColorOnPrimary">@color/system_on_primary_light</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_light</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item> + <item name="materialColorOnSurface">@color/system_on_surface_light</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_light</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item> <item name="materialColorOutline">@color/system_outline_light</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_light</item> - <item name="materialColorOnPrimary">@color/system_on_primary_light</item> - <item name="materialColorOnSurface">@color/system_on_surface_light</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_light</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_light</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</item> <item name="materialColorPrimary">@color/system_primary_light</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_light</item> + <item name="materialColorScrim">@color/system_scrim_light</item> <item name="materialColorSecondary">@color/system_secondary_light</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item> + <item name="materialColorShadow">@color/system_shadow_light</item> + <item name="materialColorSurface">@color/system_surface_light</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_light</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_light</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_light</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_light</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item> <item name="materialColorTertiary">@color/system_tertiary_light</item> - <item name="materialColorError">@color/system_error_light</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_light</item> - <item name="customColorClockHour">@color/system_clock_hour_light</item> - <item name="customColorClockMinute">@color/system_clock_minute_light</item> - <item name="customColorClockSecond">@color/system_clock_second_light</item> - <item name="customColorThemeApp">@color/system_theme_app_light</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> - <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_light</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_light</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_light</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_light</item> <item name="customColorBrandB">@color/system_brand_b_light</item> <item name="customColorBrandC">@color/system_brand_c_light</item> <item name="customColorBrandD">@color/system_brand_d_light</item> - <item name="customColorUnderSurface">@color/system_under_surface_light</item> - <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorClockHour">@color/system_clock_hour_light</item> + <item name="customColorClockMinute">@color/system_clock_minute_light</item> + <item name="customColorClockSecond">@color/system_clock_second_light</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_light</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_light</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_light</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_light</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_light</item> <item name="customColorOverviewBackground">@color/system_overview_background_light</item> + <item name="customColorShadeActive">@color/system_shade_active_light</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_light</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_light</item> + <item name="customColorThemeApp">@color/system_theme_app_light</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_light</item> + <item name="customColorThemeNotif">@color/system_theme_notif_light</item> + <item name="customColorUnderSurface">@color/system_under_surface_light</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_light</item> + <item name="customColorWidgetBackground">@color/system_widget_background_light</item> </style> <style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification"> @@ -6107,73 +6954,90 @@ easier. <item name="textColorPrimary">@color/system_neutral1_900</item> <item name="textColorSecondary">@color/system_neutral2_700</item> - <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> - <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> - <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> - <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> - <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> - <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> - <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> - <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> - <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> - <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> - <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> - <item name="materialColorOnSurfaceInverse">@color/system_on_surface_light</item> - <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> - <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> - <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> - <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorBackground">@color/system_background_dark</item> + <item name="materialColorControlActivated">@color/system_control_activated_dark</item> + <item name="materialColorControlHighlight">@color/system_control_highlight_dark</item> + <item name="materialColorControlNormal">@color/system_control_normal_dark</item> + <item name="materialColorError">@color/system_error_dark</item> <item name="materialColorErrorContainer">@color/system_error_container_dark</item> - <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> - <item name="materialColorPrimaryInverse">@color/system_primary_light</item> - <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> - <item name="materialColorSurfaceInverse">@color/system_surface_light</item> - <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> - <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> - <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> - <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</item> + <item name="materialColorInversePrimary">@color/system_inverse_primary_dark</item> + <item name="materialColorInverseSurface">@color/system_inverse_surface_dark</item> <item name="materialColorOnBackground">@color/system_on_background_dark</item> - <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> - <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> - <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> - <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> - <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> <item name="materialColorOnError">@color/system_on_error_dark</item> - <item name="materialColorSurface">@color/system_surface_dark</item> - <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> - <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item> + <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> + <item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item> + <item name="materialColorOnSecondary">@color/system_on_secondary_dark</item> + <item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item> + <item name="materialColorOnSurface">@color/system_on_surface_dark</item> <item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item> + <item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item> + <item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item> <item name="materialColorOutline">@color/system_outline_dark</item> <item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item> - <item name="materialColorOnPrimary">@color/system_on_primary_dark</item> - <item name="materialColorOnSurface">@color/system_on_surface_dark</item> - <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_dark</item> + <item name="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</item> + <item name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</item> + <item name="materialColorPaletteKeyColorSecondary">@color/system_palette_key_color_secondary_dark</item> + <item name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</item> <item name="materialColorPrimary">@color/system_primary_dark</item> + <item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item> + <item name="materialColorScrim">@color/system_scrim_dark</item> <item name="materialColorSecondary">@color/system_secondary_dark</item> + <item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item> + <item name="materialColorShadow">@color/system_shadow_dark</item> + <item name="materialColorSurface">@color/system_surface_dark</item> + <item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item> + <item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item> + <item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item> + <item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item> + <item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item> + <item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item> + <item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item> + <item name="materialColorSurfaceTint">@color/system_surface_tint_dark</item> + <item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item> <item name="materialColorTertiary">@color/system_tertiary_dark</item> - <item name="materialColorError">@color/system_error_dark</item> - - <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> - <item name="customColorClockHour">@color/system_clock_hour_dark</item> - <item name="customColorClockMinute">@color/system_clock_minute_dark</item> - <item name="customColorClockSecond">@color/system_clock_second_dark</item> - <item name="customColorThemeApp">@color/system_theme_app_dark</item> - <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> - <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> - <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item> + <item name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</item> + <item name="materialColorTextPrimaryInverse">@color/system_text_primary_inverse_dark</item> + <item name="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverse">@color/system_text_secondary_and_tertiary_inverse_dark</item> + <item name="materialColorTextSecondaryAndTertiaryInverseDisabled">@color/system_text_secondary_and_tertiary_inverse_disabled_dark</item> + <item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item> + <item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item> + <item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item> + <item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item> + <item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item> + <item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item> + <item name="materialColorPrimaryFixed">@color/system_primary_fixed</item> + <item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item> + <item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item> + <item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item> + <item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item> + <item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item> <item name="customColorBrandA">@color/system_brand_a_dark</item> <item name="customColorBrandB">@color/system_brand_b_dark</item> <item name="customColorBrandC">@color/system_brand_c_dark</item> <item name="customColorBrandD">@color/system_brand_d_dark</item> - <item name="customColorUnderSurface">@color/system_under_surface_dark</item> - <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorClockHour">@color/system_clock_hour_dark</item> + <item name="customColorClockMinute">@color/system_clock_minute_dark</item> + <item name="customColorClockSecond">@color/system_clock_second_dark</item> <item name="customColorOnShadeActive">@color/system_on_shade_active_dark</item> <item name="customColorOnShadeActiveVariant">@color/system_on_shade_active_variant_dark</item> - <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> <item name="customColorOnShadeInactive">@color/system_on_shade_inactive_dark</item> <item name="customColorOnShadeInactiveVariant">@color/system_on_shade_inactive_variant_dark</item> - <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorOnThemeApp">@color/system_on_theme_app_dark</item> <item name="customColorOverviewBackground">@color/system_overview_background_dark</item> + <item name="customColorShadeActive">@color/system_shade_active_dark</item> + <item name="customColorShadeDisabled">@color/system_shade_disabled_dark</item> + <item name="customColorShadeInactive">@color/system_shade_inactive_dark</item> + <item name="customColorThemeApp">@color/system_theme_app_dark</item> + <item name="customColorThemeAppRing">@color/system_theme_app_ring_dark</item> + <item name="customColorThemeNotif">@color/system_theme_notif_dark</item> + <item name="customColorUnderSurface">@color/system_under_surface_dark</item> + <item name="customColorWeatherTemp">@color/system_weather_temp_dark</item> + <item name="customColorWidgetBackground">@color/system_widget_background_dark</item> </style> <style name="Theme.DeviceDefault.AutofillHalfScreenDialogList" parent="Theme.DeviceDefault.DayNight"> <item name="colorListDivider">@color/list_divider_opacity_device_default_light</item> diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml index fadcf7ba8699..e68253e2200d 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml @@ -18,7 +18,7 @@ <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight"> <item name="elevationOverlayEnabled">true</item> <item name="elevationOverlayColor">?attr/colorPrimary</item> - <item name="colorPrimary">@color/settingslib_materialColorOnSurfaceInverse</item> + <item name="colorPrimary">@color/settingslib_materialColorInverseOnSurface</item> <item name="colorAccent">@color/settingslib_materialColorPrimaryFixed</item> </style> </resources>
\ No newline at end of file diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml index 7c9d1a47b7ef..f7c9aac68629 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml @@ -18,7 +18,7 @@ <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight"> <item name="elevationOverlayEnabled">true</item> <item name="elevationOverlayColor">?attr/colorPrimary</item> - <item name="colorPrimary">@color/settingslib_materialColorOnSurfaceInverse</item> + <item name="colorPrimary">@color/settingslib_materialColorInverseOnSurface</item> <item name="colorAccent">@color/settingslib_materialColorPrimary</item> </style> </resources>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml index b46181e20eaa..8b574aa95176 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v31/settingslib_surface_light.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!--Deprecated. After sdk 35, don't use it, using materialColorOnSurfaceInverse in light theme --> +<!--Deprecated. After sdk 35, don't use it, using materialColorInverseOnSurface in light theme --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:color="@android:color/system_neutral1_500" android:lStar="98" /> </selector>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml index 313748d8f091..46ec62e7a5ef 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml @@ -51,7 +51,7 @@ <color name="settingslib_text_color_preference_category_title">@android:color/system_accent1_100</color> - <!--Deprecated. After sdk 35, don't use it, using materialColorOnSurfaceInverse in dark theme --> + <!--Deprecated. After sdk 35, don't use it, using materialColorInverseOnSurface in dark theme --> <color name="settingslib_surface_dark">@android:color/system_neutral1_800</color> <!--Deprecated. After sdk 35, don't use it--> diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml index 94ff02d898db..84a3ed68af01 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml @@ -53,11 +53,11 @@ <color name="settingslib_materialColorSurfaceContainerLow">@android:color/system_surface_container_low_dark</color> <color name="settingslib_materialColorOnPrimaryContainer">@android:color/system_on_primary_container_dark</color> <color name="settingslib_materialColorOnErrorContainer">@android:color/system_on_error_container_dark</color> - <color name="settingslib_materialColorOnSurfaceInverse">@android:color/system_on_surface_light</color> + <color name="settingslib_materialColorInverseOnSurface">@android:color/system_on_surface_light</color> <color name="settingslib_materialColorSecondaryContainer">@android:color/system_secondary_container_dark</color> <color name="settingslib_materialColorErrorContainer">@android:color/system_error_container_dark</color> - <color name="settingslib_materialColorPrimaryInverse">@android:color/system_primary_light</color> - <color name="settingslib_materialColorSurfaceInverse">@android:color/system_surface_light</color> + <color name="settingslib_materialColorInversePrimary">@android:color/system_primary_light</color> + <color name="settingslib_materialColorInverseSurface">@android:color/system_surface_light</color> <color name="settingslib_materialColorSurfaceVariant">@android:color/system_surface_variant_dark</color> <color name="settingslib_materialColorTertiaryContainer">@android:color/system_tertiary_container_dark</color> <color name="settingslib_materialColorPrimaryContainer">@android:color/system_primary_container_dark</color> diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml index b99ee5123491..fef92b792bec 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml @@ -67,9 +67,9 @@ <color name="settingslib_accent_primary_variant">@android:color/system_accent1_600</color> <!--Deprecated. After sdk 35 don't use it.--> <color name="settingslib_accent_secondary_device_default">@android:color/system_accent2_100</color> - <!--Deprecated. After sdk 35 don't use it.using materialColorOnSurfaceInverse in dark theme--> + <!--Deprecated. After sdk 35 don't use it.using materialColorInverseOnSurface in dark theme--> <color name="settingslib_background_device_default_dark">@android:color/system_neutral1_900</color> - <!--Deprecated. After sdk 35 don't use it. using materialColorOnSurfaceInverse in light theme--> + <!--Deprecated. After sdk 35 don't use it. using materialColorInverseOnSurface in light theme--> <color name="settingslib_background_device_default_light">@android:color/system_neutral1_50</color> <!--Deprecated. After sdk 35 don't use it. using materialColorOnSurface--> <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_900</color> diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml index 8b9501608000..90c19e1aa676 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml @@ -66,16 +66,16 @@ <color name="settingslib_materialColorSecondaryFixedDim">@android:color/system_secondary_fixed_dim</color> <color name="settingslib_materialColorOnErrorContainer">@android:color/system_on_error_container_light</color> <color name="settingslib_materialColorOnSecondaryFixed">@android:color/system_on_secondary_fixed</color> - <color name="settingslib_materialColorOnSurfaceInverse">@android:color/system_on_surface_dark</color> + <color name="settingslib_materialColorInverseOnSurface">@android:color/system_on_surface_dark</color> <color name="settingslib_materialColorTertiaryFixedDim">@android:color/system_tertiary_fixed_dim</color> <color name="settingslib_materialColorOnTertiaryFixed">@android:color/system_on_tertiary_fixed</color> <color name="settingslib_materialColorPrimaryFixedDim">@android:color/system_primary_fixed_dim</color> <color name="settingslib_materialColorSecondaryContainer">@android:color/system_secondary_container_light</color> <color name="settingslib_materialColorErrorContainer">@android:color/system_error_container_light</color> <color name="settingslib_materialColorOnPrimaryFixed">@android:color/system_on_primary_fixed</color> - <color name="settingslib_materialColorPrimaryInverse">@android:color/system_primary_dark</color> + <color name="settingslib_materialColorInversePrimary">@android:color/system_primary_dark</color> <color name="settingslib_materialColorSecondaryFixed">@android:color/system_secondary_fixed</color> - <color name="settingslib_materialColorSurfaceInverse">@android:color/system_surface_dark</color> + <color name="settingslib_materialColorInverseSurface">@android:color/system_surface_dark</color> <color name="settingslib_materialColorSurfaceVariant">@android:color/system_surface_variant_light</color> <color name="settingslib_materialColorTertiaryContainer">@android:color/system_tertiary_container_light</color> <color name="settingslib_materialColorTertiaryFixed">@android:color/system_tertiary_fixed</color> diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 3df96030d221..2a7db925c7c1 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1727,6 +1727,16 @@ flag { } flag { + name: "material_colors_10_2024" + namespace: "systemui" + description: "Adding new Material Tokens as of October 2024" + bug: "376195115" + metadata { + purpose: PURPOSE_FEATURE + } +} + +flag { name: "qs_tile_detailed_view" namespace: "systemui" description: "Enables the tile detailed view UI." @@ -1757,7 +1767,6 @@ flag { bug: "371224114" } - flag { name: "keyboard_shortcut_helper_shortcut_customizer" namespace: "systemui" @@ -1783,4 +1792,4 @@ flag { metadata { purpose: PURPOSE_BUGFIX } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt b/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt index d31d7aa59489..71ec63c1666c 100644 --- a/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt +++ b/packages/SystemUI/compose/core/src/com/android/compose/theme/PlatformTheme.kt @@ -63,6 +63,9 @@ private fun platformColorScheme(isDarkTheme: Boolean, context: Context): ColorSc return if (isDarkTheme) { dynamicDarkColorScheme(context) .copy( + inverseSurface = color(context, R.color.system_inverse_surface_dark), + inverseOnSurface = color(context, R.color.system_inverse_on_surface_dark), + inversePrimary = color(context, R.color.system_inverse_primary_dark), error = color(context, R.color.system_error_dark), onError = color(context, R.color.system_on_error_dark), errorContainer = color(context, R.color.system_error_container_dark), @@ -71,6 +74,9 @@ private fun platformColorScheme(isDarkTheme: Boolean, context: Context): ColorSc } else { dynamicLightColorScheme(context) .copy( + inverseSurface = color(context, R.color.system_inverse_surface_light), + inverseOnSurface = color(context, R.color.system_inverse_on_surface_light), + inversePrimary = color(context, R.color.system_inverse_primary_light), error = color(context, R.color.system_error_light), onError = color(context, R.color.system_on_error_light), errorContainer = color(context, R.color.system_error_container_light), diff --git a/packages/SystemUI/compose/core/tests/src/com/android/compose/theme/PlatformThemeTest.kt b/packages/SystemUI/compose/core/tests/src/com/android/compose/theme/PlatformThemeTest.kt index de021a0677cf..737853b88f7a 100644 --- a/packages/SystemUI/compose/core/tests/src/com/android/compose/theme/PlatformThemeTest.kt +++ b/packages/SystemUI/compose/core/tests/src/com/android/compose/theme/PlatformThemeTest.kt @@ -89,7 +89,7 @@ class PlatformThemeTest { addValue( "inversePrimary", colorScheme.inversePrimary, - R.attr.materialColorPrimaryInverse, + R.attr.materialColorInversePrimary, ) addValue("secondary", colorScheme.secondary, R.attr.materialColorSecondary) addValue("onSecondary", colorScheme.onSecondary, R.attr.materialColorOnSecondary) @@ -131,12 +131,12 @@ class PlatformThemeTest { addValue( "inverseSurface", colorScheme.inverseSurface, - R.attr.materialColorSurfaceInverse, + R.attr.materialColorInverseSurface, ) addValue( "inverseOnSurface", colorScheme.inverseOnSurface, - R.attr.materialColorOnSurfaceInverse, + R.attr.materialColorInverseOnSurface, ) addValue("error", colorScheme.error, R.attr.materialColorError) addValue("onError", colorScheme.onError, R.attr.materialColorOnError) |