diff options
| -rw-r--r-- | core/res/res/color/surface_highlight_dark.xml | 19 | ||||
| -rw-r--r-- | core/res/res/color/surface_light.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 21 | ||||
| -rw-r--r-- | core/res/res/values/colors_device_defaults.xml | 22 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes_device_defaults.xml | 322 |
6 files changed, 403 insertions, 3 deletions
diff --git a/core/res/res/color/surface_highlight_dark.xml b/core/res/res/color/surface_highlight_dark.xml new file mode 100644 index 000000000000..2bebe25599d4 --- /dev/null +++ b/core/res/res/color/surface_highlight_dark.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 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. + --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="@color/system_neutral1_500" lStar="35" /> +</selector> diff --git a/core/res/res/color/surface_light.xml b/core/res/res/color/surface_light.xml new file mode 100644 index 000000000000..8a96f98bb331 --- /dev/null +++ b/core/res/res/color/surface_light.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="@color/system_neutral1_500" lStar="97" /> +</selector> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index f508b3ed5d3c..bd1d84811d4f 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1134,6 +1134,15 @@ <!-- Tertiary accent color used on Material NEXT buttons. @hide --> <attr name="colorAccentTertiary" format="color" /> + <!-- Darker accent color used on Material NEXT buttons. @hide --> + <attr name="colorAccentPrimaryVariant" format="color" /> + + <!-- Secondary darker accent color used on Material NEXT buttons. @hide --> + <attr name="colorAccentSecondaryVariant" format="color" /> + + <!-- Tertiary darker accent color used on Material NEXT buttons. @hide --> + <attr name="colorAccentTertiaryVariant" format="color" /> + <!-- The color applied to framework controls in their normal state. --> <attr name="colorControlNormal" format="color" /> @@ -1155,6 +1164,18 @@ <!-- The color applied to the edge effect on scrolling containers. --> <attr name="colorEdgeEffect" format="color" /> + <!-- The color applied to surfaces on top of colorBackground. @hide --> + <attr name="colorSurface" format="color" /> + + <!-- Alternative color applied to surfaces on top of colorBackground. @hide --> + <attr name="colorSurfaceHighlight" format="color" /> + + <!-- Alternative color applied to surfaces on top of colorBackground. @hide --> + <attr name="colorSurfaceVariant" format="color" /> + + <!-- Alternative color applied to surfaces on top of colorBackground. @hide --> + <attr name="colorSurfaceHeader" format="color" /> + <!-- The type of the edge effect. The default is glow. --> <attr name="edgeEffectType"> <!-- Use a colored glow at the edge. --> diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml index 0b41769b08ac..4d61d97ee191 100644 --- a/core/res/res/values/colors_device_defaults.xml +++ b/core/res/res/values/colors_device_defaults.xml @@ -25,14 +25,13 @@ <color name="primary_dark_device_default_light">@color/primary_device_default_light</color> <color name="primary_dark_device_default_settings">@color/primary_device_default_dark</color> <color name="primary_dark_device_default_settings_light">@color/primary_device_default_light</color> - - <color name="navigation_bar_divider_device_default_settings">#1f000000</color> - <color name="secondary_device_default_settings">@color/secondary_material_settings</color> <color name="secondary_device_default_settings_light">@color/secondary_material_settings_light</color> <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color> <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color> + <color name="navigation_bar_divider_device_default_settings">#1f000000</color> + <!-- Accent colors --> <color name="accent_device_default_light">@color/system_accent1_600</color> <color name="accent_device_default_dark">@color/system_accent1_200</color> <color name="accent_device_default">@color/accent_device_default_light</color> @@ -40,11 +39,28 @@ <color name="accent_secondary_device_default">@color/system_accent2_100</color> <color name="accent_tertiary_device_default">@color/system_accent3_100</color> + <!-- Accent variants --> + <color name="accent_primary_variant_light_device_default">@color/system_accent1_600</color> + <color name="accent_secondary_variant_light_device_default">@color/system_accent2_600</color> + <color name="accent_tertiary_variant_light_device_default">@color/system_accent3_600</color> + <color name="accent_primary_variant_dark_device_default">@color/system_accent1_300</color> + <color name="accent_secondary_variant_dark_device_default">@color/system_accent2_300</color> + <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color> + + <!-- Background colors --> <color name="background_device_default_dark">@color/system_neutral1_800</color> <color name="background_device_default_light">@color/system_neutral1_50</color> <color name="background_floating_device_default_dark">@color/system_neutral1_900</color> <color name="background_floating_device_default_light">@color/system_neutral1_100</color> + <!-- Surface colors --> + <color name="surface_header_dark">@color/system_neutral1_700</color> + <color name="surface_header_light">@color/system_neutral1_100</color> + <color name="surface_variant_dark">@color/system_neutral1_700</color> + <color name="surface_variant_light">@color/system_neutral2_100</color> + <color name="surface_dark">@color/system_neutral1_800</color> + <color name="surface_highlight_light">@color/system_neutral1_0</color> + <!-- Please refer to text_color_[primary]_device_default_[light].xml for text colors--> <color name="foreground_device_default_light">@color/text_color_primary_device_default_light</color> <color name="foreground_device_default_dark">@color/text_color_primary_device_default_dark</color> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index eb1fe1dd367d..2d3147cb2540 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4220,6 +4220,10 @@ <java-symbol type="attr" name="colorAccentPrimary" /> <java-symbol type="attr" name="colorAccentSecondary" /> <java-symbol type="attr" name="colorAccentTertiary" /> + <java-symbol type="attr" name="colorSurface" format="color" /> + <java-symbol type="attr" name="colorSurfaceHighlight" format="color" /> + <java-symbol type="attr" name="colorSurfaceVariant" format="color" /> + <java-symbol type="attr" name="colorSurfaceHeader" format="color" /> <!-- CEC Configuration --> <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" /> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index ca4265a90fc3..1d4beae8cc58 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -217,6 +217,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -243,6 +250,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -281,6 +295,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -321,6 +342,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -360,6 +388,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -414,6 +449,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -445,6 +487,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -482,6 +531,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -520,6 +576,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -574,6 +637,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -613,6 +683,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -650,6 +727,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -689,6 +773,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -727,6 +818,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -765,6 +863,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -803,6 +908,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -841,6 +953,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -883,6 +1002,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -922,6 +1048,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -958,6 +1091,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -1148,6 +1288,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1170,6 +1317,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1207,6 +1361,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1245,6 +1406,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1285,6 +1453,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1324,6 +1499,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1380,6 +1562,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1410,6 +1599,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1450,6 +1646,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1491,6 +1694,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1533,6 +1743,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> @@ -1555,6 +1772,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="textColorPrimary">@color/text_color_primary_device_default_light</item> <item name="textColorSecondary">@color/text_color_secondary_device_default_light</item> @@ -1576,6 +1800,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1618,6 +1849,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1658,6 +1896,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1697,6 +1942,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1735,6 +1987,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1773,6 +2032,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1809,6 +2075,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -1862,6 +2135,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorEdgeEffect">@color/edge_effect_device_default_light</item> @@ -1893,6 +2173,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorControlNormal">?attr/textColorPrimary</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item> @@ -1921,6 +2208,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item> @@ -1942,6 +2236,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_dark_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_dark_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_dark_device_default</item> + <item name="colorSurface">@color/surface_dark</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_dark</item> + <item name="colorSurfaceVariant">@color/surface_variant_dark</item> + <item name="colorSurfaceHeader">@color/surface_header_dark</item> <item name="colorError">@color/error_color_device_default_dark</item> <item name="colorBackground">@color/background_device_default_dark</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> @@ -1979,6 +2280,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -2026,6 +2334,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> @@ -2066,6 +2381,13 @@ easier. <item name="colorAccentPrimary">@color/accent_primary_device_default</item> <item name="colorAccentSecondary">@color/accent_secondary_device_default</item> <item name="colorAccentTertiary">@color/accent_tertiary_device_default</item> + <item name="colorAccentPrimaryVariant">@color/accent_primary_variant_light_device_default</item> + <item name="colorAccentSecondaryVariant">@color/accent_secondary_variant_light_device_default</item> + <item name="colorAccentTertiaryVariant">@color/accent_tertiary_variant_light_device_default</item> + <item name="colorSurface">@color/surface_light</item> + <item name="colorSurfaceHighlight">@color/surface_highlight_light</item> + <item name="colorSurfaceVariant">@color/surface_variant_light</item> + <item name="colorSurfaceHeader">@color/surface_header_light</item> <item name="colorError">@color/error_color_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item> |