Merge "[DO NOT REVERT] Updates Material Color Library" into main (7e705d7d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+10 −0

core/java/android/os/flags.aconfig

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -283,6 +283,17 @@ flag {
	}		}
	}		}

			flag {
			name: "material_colors_2025_03"
			namespace: "systemui"
			description: "Adding new Material Tokens as of March 2025"
			bug: "394371316"
			is_exported: true
			metadata {
			purpose: PURPOSE_FEATURE
			}
			}

	flag {		flag {
	name: "material_motion_tokens"		name: "material_motion_tokens"
	namespace: "systemui"		namespace: "systemui"

core/res/res/values-night/colors_dynamic.xml

+99 −16

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="UTF-8"?>
	<!-- Copyright (C) 2024 The Android Open Source Project		<!--
			~ 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.		~ Licensed under the Apache License, Version 2.0 (the "License");
	You may obtain a copy of the License at		~ 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		~
			~ 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,		~ Unless required by applicable law or agreed to in writing, software
	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		~ distributed under the License is distributed on an "AS IS" BASIS,
	See the License for the specific language governing permissions and		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	limitations under the License.		~ See the License for the specific language governing permissions and
			~ limitations under the License.
	-->		-->
			<!--Auto generated by: atest ColorSchemeTest#Any-->
	<!-- Colors specific to Material themes. -->
	<resources>		<resources>
			<color name="system_accent1_0">@color/system_accent1_0_dark</color>
			<color name="system_accent1_10">@color/system_accent1_10_dark</color>
			<color name="system_accent1_50">@color/system_accent1_50_dark</color>
			<color name="system_accent1_100">@color/system_accent1_100_dark</color>
			<color name="system_accent1_200">@color/system_accent1_200_dark</color>
			<color name="system_accent1_300">@color/system_accent1_300_dark</color>
			<color name="system_accent1_400">@color/system_accent1_400_dark</color>
			<color name="system_accent1_500">@color/system_accent1_500_dark</color>
			<color name="system_accent1_600">@color/system_accent1_600_dark</color>
			<color name="system_accent1_700">@color/system_accent1_700_dark</color>
			<color name="system_accent1_800">@color/system_accent1_800_dark</color>
			<color name="system_accent1_900">@color/system_accent1_900_dark</color>
			<color name="system_accent1_1000">@color/system_accent1_1000_dark</color>
			<color name="system_accent2_0">@color/system_accent2_0_dark</color>
			<color name="system_accent2_10">@color/system_accent2_10_dark</color>
			<color name="system_accent2_50">@color/system_accent2_50_dark</color>
			<color name="system_accent2_100">@color/system_accent2_100_dark</color>
			<color name="system_accent2_200">@color/system_accent2_200_dark</color>
			<color name="system_accent2_300">@color/system_accent2_300_dark</color>
			<color name="system_accent2_400">@color/system_accent2_400_dark</color>
			<color name="system_accent2_500">@color/system_accent2_500_dark</color>
			<color name="system_accent2_600">@color/system_accent2_600_dark</color>
			<color name="system_accent2_700">@color/system_accent2_700_dark</color>
			<color name="system_accent2_800">@color/system_accent2_800_dark</color>
			<color name="system_accent2_900">@color/system_accent2_900_dark</color>
			<color name="system_accent2_1000">@color/system_accent2_1000_dark</color>
			<color name="system_accent3_0">@color/system_accent3_0_dark</color>
			<color name="system_accent3_10">@color/system_accent3_10_dark</color>
			<color name="system_accent3_50">@color/system_accent3_50_dark</color>
			<color name="system_accent3_100">@color/system_accent3_100_dark</color>
			<color name="system_accent3_200">@color/system_accent3_200_dark</color>
			<color name="system_accent3_300">@color/system_accent3_300_dark</color>
			<color name="system_accent3_400">@color/system_accent3_400_dark</color>
			<color name="system_accent3_500">@color/system_accent3_500_dark</color>
			<color name="system_accent3_600">@color/system_accent3_600_dark</color>
			<color name="system_accent3_700">@color/system_accent3_700_dark</color>
			<color name="system_accent3_800">@color/system_accent3_800_dark</color>
			<color name="system_accent3_900">@color/system_accent3_900_dark</color>
			<color name="system_accent3_1000">@color/system_accent3_1000_dark</color>
			<color name="system_neutral1_0">@color/system_neutral1_0_dark</color>
			<color name="system_neutral1_10">@color/system_neutral1_10_dark</color>
			<color name="system_neutral1_50">@color/system_neutral1_50_dark</color>
			<color name="system_neutral1_100">@color/system_neutral1_100_dark</color>
			<color name="system_neutral1_200">@color/system_neutral1_200_dark</color>
			<color name="system_neutral1_300">@color/system_neutral1_300_dark</color>
			<color name="system_neutral1_400">@color/system_neutral1_400_dark</color>
			<color name="system_neutral1_500">@color/system_neutral1_500_dark</color>
			<color name="system_neutral1_600">@color/system_neutral1_600_dark</color>
			<color name="system_neutral1_700">@color/system_neutral1_700_dark</color>
			<color name="system_neutral1_800">@color/system_neutral1_800_dark</color>
			<color name="system_neutral1_900">@color/system_neutral1_900_dark</color>
			<color name="system_neutral1_1000">@color/system_neutral1_1000_dark</color>
			<color name="system_neutral2_0">@color/system_neutral2_0_dark</color>
			<color name="system_neutral2_10">@color/system_neutral2_10_dark</color>
			<color name="system_neutral2_50">@color/system_neutral2_50_dark</color>
			<color name="system_neutral2_100">@color/system_neutral2_100_dark</color>
			<color name="system_neutral2_200">@color/system_neutral2_200_dark</color>
			<color name="system_neutral2_300">@color/system_neutral2_300_dark</color>
			<color name="system_neutral2_400">@color/system_neutral2_400_dark</color>
			<color name="system_neutral2_500">@color/system_neutral2_500_dark</color>
			<color name="system_neutral2_600">@color/system_neutral2_600_dark</color>
			<color name="system_neutral2_700">@color/system_neutral2_700_dark</color>
			<color name="system_neutral2_800">@color/system_neutral2_800_dark</color>
			<color name="system_neutral2_900">@color/system_neutral2_900_dark</color>
			<color name="system_neutral2_1000">@color/system_neutral2_1000_dark</color>
			<color name="system_error_0">@color/system_error_0_dark</color>
			<color name="system_error_10">@color/system_error_10_dark</color>
			<color name="system_error_50">@color/system_error_50_dark</color>
			<color name="system_error_100">@color/system_error_100_dark</color>
			<color name="system_error_200">@color/system_error_200_dark</color>
			<color name="system_error_300">@color/system_error_300_dark</color>
			<color name="system_error_400">@color/system_error_400_dark</color>
			<color name="system_error_500">@color/system_error_500_dark</color>
			<color name="system_error_600">@color/system_error_600_dark</color>
			<color name="system_error_700">@color/system_error_700_dark</color>
			<color name="system_error_800">@color/system_error_800_dark</color>
			<color name="system_error_900">@color/system_error_900_dark</color>
			<color name="system_error_1000">@color/system_error_1000_dark</color>
	<color name="materialColorBackground">@color/system_background_dark</color>		<color name="materialColorBackground">@color/system_background_dark</color>
	<color name="materialColorControlActivated">@color/system_control_activated_dark</color>		<color name="materialColorControlActivated">@color/system_control_activated_dark</color>
	<color name="materialColorControlHighlight">@color/system_control_highlight_dark</color>		<color name="materialColorControlHighlight">@color/system_control_highlight_dark</color>
	<color name="materialColorControlNormal">@color/system_control_normal_dark</color>		<color name="materialColorControlNormal">@color/system_control_normal_dark</color>
	<color name="materialColorError">@color/system_error_dark</color>		<color name="materialColorError">@color/system_error_dark</color>
	<color name="materialColorErrorContainer">@color/system_error_container_dark</color>		<color name="materialColorErrorContainer">@color/system_error_container_dark</color>
			<color name="materialColorErrorDim">@color/system_error_dim_dark</color>
	<color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</color>		<color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_dark</color>
	<color name="materialColorInversePrimary">@color/system_inverse_primary_dark</color>		<color name="materialColorInversePrimary">@color/system_inverse_primary_dark</color>
	<color name="materialColorInverseSurface">@color/system_inverse_surface_dark</color>		<color name="materialColorInverseSurface">@color/system_inverse_surface_dark</color>
	@@ -38,6 +117,7 @@
	<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</color>		<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</color>
	<color name="materialColorOutline">@color/system_outline_dark</color>		<color name="materialColorOutline">@color/system_outline_dark</color>
	<color name="materialColorOutlineVariant">@color/system_outline_variant_dark</color>		<color name="materialColorOutlineVariant">@color/system_outline_variant_dark</color>
			<color name="materialColorPaletteKeyColorError">@color/system_palette_key_color_error_dark</color>
	<color name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_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="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_dark</color>
	<color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</color>		<color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_dark</color>
	@@ -45,9 +125,11 @@
	<color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</color>		<color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_dark</color>
	<color name="materialColorPrimary">@color/system_primary_dark</color>		<color name="materialColorPrimary">@color/system_primary_dark</color>
	<color name="materialColorPrimaryContainer">@color/system_primary_container_dark</color>		<color name="materialColorPrimaryContainer">@color/system_primary_container_dark</color>
			<color name="materialColorPrimaryDim">@color/system_primary_dim_dark</color>
	<color name="materialColorScrim">@color/system_scrim_dark</color>		<color name="materialColorScrim">@color/system_scrim_dark</color>
	<color name="materialColorSecondary">@color/system_secondary_dark</color>		<color name="materialColorSecondary">@color/system_secondary_dark</color>
	<color name="materialColorSecondaryContainer">@color/system_secondary_container_dark</color>		<color name="materialColorSecondaryContainer">@color/system_secondary_container_dark</color>
			<color name="materialColorSecondaryDim">@color/system_secondary_dim_dark</color>
	<color name="materialColorShadow">@color/system_shadow_dark</color>		<color name="materialColorShadow">@color/system_shadow_dark</color>
	<color name="materialColorSurface">@color/system_surface_dark</color>		<color name="materialColorSurface">@color/system_surface_dark</color>
	<color name="materialColorSurfaceBright">@color/system_surface_bright_dark</color>		<color name="materialColorSurfaceBright">@color/system_surface_bright_dark</color>
	@@ -61,6 +143,7 @@
	<color name="materialColorSurfaceVariant">@color/system_surface_variant_dark</color>		<color name="materialColorSurfaceVariant">@color/system_surface_variant_dark</color>
	<color name="materialColorTertiary">@color/system_tertiary_dark</color>		<color name="materialColorTertiary">@color/system_tertiary_dark</color>
	<color name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</color>		<color name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</color>
			<color name="materialColorTertiaryDim">@color/system_tertiary_dim_dark</color>
	<color name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</color>		<color name="materialColorTextHintInverse">@color/system_text_hint_inverse_dark</color>
	<color name="materialColorTextPrimaryInverse">@color/system_text_primary_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="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_dark</color>

core/res/res/values/colors.xml

+385 −220

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/colors_dynamic.xml

+99 −16

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="utf-8"?>		<?xml version="1.0" encoding="UTF-8"?>
	<!-- Copyright (C) 2024 The Android Open Source Project		<!--
			~ Copyright (C) 2022 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.		~ Licensed under the Apache License, Version 2.0 (the "License");
	You may obtain a copy of the License at		~ 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		~
			~ 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,		~ Unless required by applicable law or agreed to in writing, software
	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		~ distributed under the License is distributed on an "AS IS" BASIS,
	See the License for the specific language governing permissions and		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	limitations under the License.		~ See the License for the specific language governing permissions and
			~ limitations under the License.
	-->		-->
			<!--Auto generated by: atest ColorSchemeTest#Any-->
	<!-- Colors specific to Material themes. -->
	<resources>		<resources>
			<color name="system_accent1_0">@color/system_accent1_0_light</color>
			<color name="system_accent1_10">@color/system_accent1_10_light</color>
			<color name="system_accent1_50">@color/system_accent1_50_light</color>
			<color name="system_accent1_100">@color/system_accent1_100_light</color>
			<color name="system_accent1_200">@color/system_accent1_200_light</color>
			<color name="system_accent1_300">@color/system_accent1_300_light</color>
			<color name="system_accent1_400">@color/system_accent1_400_light</color>
			<color name="system_accent1_500">@color/system_accent1_500_light</color>
			<color name="system_accent1_600">@color/system_accent1_600_light</color>
			<color name="system_accent1_700">@color/system_accent1_700_light</color>
			<color name="system_accent1_800">@color/system_accent1_800_light</color>
			<color name="system_accent1_900">@color/system_accent1_900_light</color>
			<color name="system_accent1_1000">@color/system_accent1_1000_light</color>
			<color name="system_accent2_0">@color/system_accent2_0_light</color>
			<color name="system_accent2_10">@color/system_accent2_10_light</color>
			<color name="system_accent2_50">@color/system_accent2_50_light</color>
			<color name="system_accent2_100">@color/system_accent2_100_light</color>
			<color name="system_accent2_200">@color/system_accent2_200_light</color>
			<color name="system_accent2_300">@color/system_accent2_300_light</color>
			<color name="system_accent2_400">@color/system_accent2_400_light</color>
			<color name="system_accent2_500">@color/system_accent2_500_light</color>
			<color name="system_accent2_600">@color/system_accent2_600_light</color>
			<color name="system_accent2_700">@color/system_accent2_700_light</color>
			<color name="system_accent2_800">@color/system_accent2_800_light</color>
			<color name="system_accent2_900">@color/system_accent2_900_light</color>
			<color name="system_accent2_1000">@color/system_accent2_1000_light</color>
			<color name="system_accent3_0">@color/system_accent3_0_light</color>
			<color name="system_accent3_10">@color/system_accent3_10_light</color>
			<color name="system_accent3_50">@color/system_accent3_50_light</color>
			<color name="system_accent3_100">@color/system_accent3_100_light</color>
			<color name="system_accent3_200">@color/system_accent3_200_light</color>
			<color name="system_accent3_300">@color/system_accent3_300_light</color>
			<color name="system_accent3_400">@color/system_accent3_400_light</color>
			<color name="system_accent3_500">@color/system_accent3_500_light</color>
			<color name="system_accent3_600">@color/system_accent3_600_light</color>
			<color name="system_accent3_700">@color/system_accent3_700_light</color>
			<color name="system_accent3_800">@color/system_accent3_800_light</color>
			<color name="system_accent3_900">@color/system_accent3_900_light</color>
			<color name="system_accent3_1000">@color/system_accent3_1000_light</color>
			<color name="system_neutral1_0">@color/system_neutral1_0_light</color>
			<color name="system_neutral1_10">@color/system_neutral1_10_light</color>
			<color name="system_neutral1_50">@color/system_neutral1_50_light</color>
			<color name="system_neutral1_100">@color/system_neutral1_100_light</color>
			<color name="system_neutral1_200">@color/system_neutral1_200_light</color>
			<color name="system_neutral1_300">@color/system_neutral1_300_light</color>
			<color name="system_neutral1_400">@color/system_neutral1_400_light</color>
			<color name="system_neutral1_500">@color/system_neutral1_500_light</color>
			<color name="system_neutral1_600">@color/system_neutral1_600_light</color>
			<color name="system_neutral1_700">@color/system_neutral1_700_light</color>
			<color name="system_neutral1_800">@color/system_neutral1_800_light</color>
			<color name="system_neutral1_900">@color/system_neutral1_900_light</color>
			<color name="system_neutral1_1000">@color/system_neutral1_1000_light</color>
			<color name="system_neutral2_0">@color/system_neutral2_0_light</color>
			<color name="system_neutral2_10">@color/system_neutral2_10_light</color>
			<color name="system_neutral2_50">@color/system_neutral2_50_light</color>
			<color name="system_neutral2_100">@color/system_neutral2_100_light</color>
			<color name="system_neutral2_200">@color/system_neutral2_200_light</color>
			<color name="system_neutral2_300">@color/system_neutral2_300_light</color>
			<color name="system_neutral2_400">@color/system_neutral2_400_light</color>
			<color name="system_neutral2_500">@color/system_neutral2_500_light</color>
			<color name="system_neutral2_600">@color/system_neutral2_600_light</color>
			<color name="system_neutral2_700">@color/system_neutral2_700_light</color>
			<color name="system_neutral2_800">@color/system_neutral2_800_light</color>
			<color name="system_neutral2_900">@color/system_neutral2_900_light</color>
			<color name="system_neutral2_1000">@color/system_neutral2_1000_light</color>
			<color name="system_error_0">@color/system_error_0_light</color>
			<color name="system_error_10">@color/system_error_10_light</color>
			<color name="system_error_50">@color/system_error_50_light</color>
			<color name="system_error_100">@color/system_error_100_light</color>
			<color name="system_error_200">@color/system_error_200_light</color>
			<color name="system_error_300">@color/system_error_300_light</color>
			<color name="system_error_400">@color/system_error_400_light</color>
			<color name="system_error_500">@color/system_error_500_light</color>
			<color name="system_error_600">@color/system_error_600_light</color>
			<color name="system_error_700">@color/system_error_700_light</color>
			<color name="system_error_800">@color/system_error_800_light</color>
			<color name="system_error_900">@color/system_error_900_light</color>
			<color name="system_error_1000">@color/system_error_1000_light</color>
	<color name="materialColorBackground">@color/system_background_light</color>		<color name="materialColorBackground">@color/system_background_light</color>
	<color name="materialColorControlActivated">@color/system_control_activated_light</color>		<color name="materialColorControlActivated">@color/system_control_activated_light</color>
	<color name="materialColorControlHighlight">@color/system_control_highlight_light</color>		<color name="materialColorControlHighlight">@color/system_control_highlight_light</color>
	<color name="materialColorControlNormal">@color/system_control_normal_light</color>		<color name="materialColorControlNormal">@color/system_control_normal_light</color>
	<color name="materialColorError">@color/system_error_light</color>		<color name="materialColorError">@color/system_error_light</color>
	<color name="materialColorErrorContainer">@color/system_error_container_light</color>		<color name="materialColorErrorContainer">@color/system_error_container_light</color>
			<color name="materialColorErrorDim">@color/system_error_dim_light</color>
	<color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</color>		<color name="materialColorInverseOnSurface">@color/system_inverse_on_surface_light</color>
	<color name="materialColorInversePrimary">@color/system_inverse_primary_light</color>		<color name="materialColorInversePrimary">@color/system_inverse_primary_light</color>
	<color name="materialColorInverseSurface">@color/system_inverse_surface_light</color>		<color name="materialColorInverseSurface">@color/system_inverse_surface_light</color>
	@@ -38,6 +117,7 @@
	<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</color>		<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</color>
	<color name="materialColorOutline">@color/system_outline_light</color>		<color name="materialColorOutline">@color/system_outline_light</color>
	<color name="materialColorOutlineVariant">@color/system_outline_variant_light</color>		<color name="materialColorOutlineVariant">@color/system_outline_variant_light</color>
			<color name="materialColorPaletteKeyColorError">@color/system_palette_key_color_error_light</color>
	<color name="materialColorPaletteKeyColorNeutral">@color/system_palette_key_color_neutral_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="materialColorPaletteKeyColorNeutralVariant">@color/system_palette_key_color_neutral_variant_light</color>
	<color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</color>		<color name="materialColorPaletteKeyColorPrimary">@color/system_palette_key_color_primary_light</color>
	@@ -45,9 +125,11 @@
	<color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</color>		<color name="materialColorPaletteKeyColorTertiary">@color/system_palette_key_color_tertiary_light</color>
	<color name="materialColorPrimary">@color/system_primary_light</color>		<color name="materialColorPrimary">@color/system_primary_light</color>
	<color name="materialColorPrimaryContainer">@color/system_primary_container_light</color>		<color name="materialColorPrimaryContainer">@color/system_primary_container_light</color>
			<color name="materialColorPrimaryDim">@color/system_primary_dim_light</color>
	<color name="materialColorScrim">@color/system_scrim_light</color>		<color name="materialColorScrim">@color/system_scrim_light</color>
	<color name="materialColorSecondary">@color/system_secondary_light</color>		<color name="materialColorSecondary">@color/system_secondary_light</color>
	<color name="materialColorSecondaryContainer">@color/system_secondary_container_light</color>		<color name="materialColorSecondaryContainer">@color/system_secondary_container_light</color>
			<color name="materialColorSecondaryDim">@color/system_secondary_dim_light</color>
	<color name="materialColorShadow">@color/system_shadow_light</color>		<color name="materialColorShadow">@color/system_shadow_light</color>
	<color name="materialColorSurface">@color/system_surface_light</color>		<color name="materialColorSurface">@color/system_surface_light</color>
	<color name="materialColorSurfaceBright">@color/system_surface_bright_light</color>		<color name="materialColorSurfaceBright">@color/system_surface_bright_light</color>
	@@ -61,6 +143,7 @@
	<color name="materialColorSurfaceVariant">@color/system_surface_variant_light</color>		<color name="materialColorSurfaceVariant">@color/system_surface_variant_light</color>
	<color name="materialColorTertiary">@color/system_tertiary_light</color>		<color name="materialColorTertiary">@color/system_tertiary_light</color>
	<color name="materialColorTertiaryContainer">@color/system_tertiary_container_light</color>		<color name="materialColorTertiaryContainer">@color/system_tertiary_container_light</color>
			<color name="materialColorTertiaryDim">@color/system_tertiary_dim_light</color>
	<color name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</color>		<color name="materialColorTextHintInverse">@color/system_text_hint_inverse_light</color>
	<color name="materialColorTextPrimaryInverse">@color/system_text_primary_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="materialColorTextPrimaryInverseDisableOnly">@color/system_text_primary_inverse_disable_only_light</color>

Original line number	Original line	Diff line number	Diff line
	@@ -2059,6 +2059,8 @@ package android {
	field public static final int system_error_container_dark = 17170597; // 0x10600a5		field public static final int system_error_container_dark = 17170597; // 0x10600a5
	field public static final int system_error_container_light = 17170554; // 0x106007a		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_dark = 17170595; // 0x10600a3
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_error_dim_dark;
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_error_dim_light;
	field public static final int system_error_light = 17170552; // 0x1060078		field public static final int system_error_light = 17170552; // 0x1060078
	field @FlaggedApi("android.os.material_colors_10_2024") public static final int system_inverse_on_surface_dark;		field @FlaggedApi("android.os.material_colors_10_2024") public static final int system_inverse_on_surface_dark;
	field @FlaggedApi("android.os.material_colors_10_2024") public static final int system_inverse_on_surface_light;		field @FlaggedApi("android.os.material_colors_10_2024") public static final int system_inverse_on_surface_light;
	@@ -2126,6 +2128,8 @@ package android {
	field public static final int system_outline_light = 17170551; // 0x1060077		field public static final int system_outline_light = 17170551; // 0x1060077
	field public static final int system_outline_variant_dark = 17170625; // 0x10600c1		field public static final int system_outline_variant_dark = 17170625; // 0x10600c1
	field public static final int system_outline_variant_light = 17170624; // 0x10600c0		field public static final int system_outline_variant_light = 17170624; // 0x10600c0
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_palette_key_color_error_dark;
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_palette_key_color_error_light;
	field public static final int system_palette_key_color_neutral_dark = 17170610; // 0x10600b2		field public static final int system_palette_key_color_neutral_dark = 17170610; // 0x10600b2
	field public static final int system_palette_key_color_neutral_light = 17170567; // 0x1060087		field public static final int system_palette_key_color_neutral_light = 17170567; // 0x1060087
	field public static final int system_palette_key_color_neutral_variant_dark = 17170611; // 0x10600b3		field public static final int system_palette_key_color_neutral_variant_dark = 17170611; // 0x10600b3
	@@ -2139,6 +2143,8 @@ package android {
	field public static final int system_primary_container_dark = 17170569; // 0x1060089		field public static final int system_primary_container_dark = 17170569; // 0x1060089
	field public static final int system_primary_container_light = 17170526; // 0x106005e		field public static final int system_primary_container_light = 17170526; // 0x106005e
	field public static final int system_primary_dark = 17170571; // 0x106008b		field public static final int system_primary_dark = 17170571; // 0x106008b
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_primary_dim_dark;
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_primary_dim_light;
	field public static final int system_primary_fixed = 17170612; // 0x10600b4		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_fixed_dim = 17170613; // 0x10600b5
	field public static final int system_primary_light = 17170528; // 0x1060060		field public static final int system_primary_light = 17170528; // 0x1060060
	@@ -2147,6 +2153,8 @@ package android {
	field public static final int system_secondary_container_dark = 17170573; // 0x106008d		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_container_light = 17170530; // 0x1060062
	field public static final int system_secondary_dark = 17170575; // 0x106008f		field public static final int system_secondary_dark = 17170575; // 0x106008f
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_secondary_dim_dark;
			field @FlaggedApi("android.os.material_colors_2025_03") public static final int system_secondary_dim_light;
	field public static final int system_secondary_fixed = 17170616; // 0x10600b8		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_fixed_dim = 17170617; // 0x10600b9
	field public static final int system_secondary_light = 17170532; // 0x1060064		field public static final int system_secondary_light = 17170532; // 0x1060064
	@@ -2176,6 +2184,8 @@ package android {
	field public static final int system_tertiary_container_dark = 17170577; // 0x1060091		field public static final int system_tertiary_container_dark = 17170577; // 0x1060091
	field public static final int system_tertiary_container_light = 17170534; // 0x1060066		field public static final int system_tertiary_container_light = 17170534; // 0x1060066
	field public static final int system_tertiary_dark = 17170579; // 0x1060093		field public static final int system_tertiary_dark = 17170579; // 0x1060093