From 6d163bb70c03a07c1bea0cedef1ce0568a44df52 Mon Sep 17 00:00:00 2001
From: manabu-nakamura <ma.nakamura@gmail.com>
Date: Tue, 25 Mar 2025 13:17:44 +0900
Subject: [PATCH] [Color] Theme.Material3Expressive.DynamicColors.* inherits
 from Theme.Material3Expressive.* instead of Theme.Material3.DynamicColors.*

---
 .../material/theme/res/values-v31/themes.xml  | 132 +++++++++++++++++-
 1 file changed, 130 insertions(+), 2 deletions(-)

diff --git a/lib/java/com/google/android/material/theme/res/values-v31/themes.xml b/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
index 2eb553cab42..908267364db 100644
--- a/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
+++ b/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
@@ -15,9 +15,137 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3.DynamicColors.Light"/>
+  <style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3Expressive.Light">
+    <item name="isMaterial3DynamicColorApplied">true</item>
+
+    <!-- Color palettes -->
+    <item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
+    <item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
+    <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
+    <item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
+    <item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_light_on_primary_container</item>
+    <item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
+    <item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
+    <item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
+    <item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
+    <item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
+    <item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
+    <item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
+    <item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_light_on_secondary_container</item>
+    <item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
+    <item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
+    <item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
+    <item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
+    <item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
+    <item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
+    <item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
+    <item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_light_on_tertiary_container</item>
+    <item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
+    <item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
+    <item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
+    <item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
+    <item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
+    <item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
+    <item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
+    <item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
+    <item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
+    <item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
+    <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
+    <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
+    <item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
+    <item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
+    <item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
+    <item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
+    <item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
+    <item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
+    <item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
+    <item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
+    <item name="colorError">@color/m3_sys_color_light_error</item>
+    <item name="colorOnError">@color/m3_sys_color_light_on_error</item>
+    <item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
+    <item name="colorOnErrorContainer">@color/m3_sys_color_light_on_error_container</item>
+
+    <!-- Default Framework Text Colors. -->
+    <item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
+    <item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
+    <item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text</item>
+    <item name="android:textColorSecondaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
+    <item name="android:textColorTertiary">@color/m3_dynamic_default_color_secondary_text</item>
+    <item name="android:textColorTertiaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
+    <item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
+    <item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
+    <item name="android:textColorHint">@color/m3_dynamic_hint_foreground</item>
+    <item name="android:textColorHintInverse">@color/m3_dynamic_dark_hint_foreground</item>
+    <item name="android:textColorHighlight">@color/m3_dynamic_highlighted_text</item>
+    <item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
+    <item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
+  </style>
 
-  <style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3.DynamicColors.Dark"/>
+  <style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3Expressive.Dark">
+    <item name="isMaterial3DynamicColorApplied">true</item>
+
+    <!-- Color palettes -->
+    <item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
+    <item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
+    <item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
+    <item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
+    <item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
+    <item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
+    <item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
+    <item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
+    <item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
+    <item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
+    <item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
+    <item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
+    <item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
+    <item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
+    <item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
+    <item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
+    <item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
+    <item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
+    <item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
+    <item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
+    <item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
+    <item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
+    <item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
+    <item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
+    <item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
+    <item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
+    <item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
+    <item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
+    <item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
+    <item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
+    <item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
+    <item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
+    <item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
+    <item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
+    <item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
+    <item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
+    <item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
+    <item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
+    <item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
+    <item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
+    <item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
+    <item name="colorError">@color/m3_sys_color_dark_error</item>
+    <item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
+    <item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
+    <item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
+
+    <!-- Default Framework Text Colors. -->
+    <item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
+    <item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
+    <item name="android:textColorSecondary">@color/m3_dynamic_dark_default_color_secondary_text</item>
+    <item name="android:textColorSecondaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
+    <item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text</item>
+    <item name="android:textColorTertiaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
+    <item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
+    <item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
+    <item name="android:textColorHint">@color/m3_dynamic_dark_hint_foreground</item>
+    <item name="android:textColorHintInverse">@color/m3_dynamic_hint_foreground</item>
+    <item name="android:textColorHighlight">@color/m3_dynamic_dark_highlighted_text</item>
+    <item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
+    <item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
+  </style>
 
   <style name="Theme.Material3.DynamicColors.Light" parent="Theme.Material3.Light">
     <item name="isMaterial3DynamicColorApplied">true</item>