[M3][Theme] Internal change

PiperOrigin-RevId: 419602208
material-components · Jan 4, 2022 · a43d7d9 · a43d7d9
1 parent 8bc6420
commit a43d7d9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -24,7 +24,6 @@
 
     <!-- Color palettes -->
     <item name="colorPrimary">@color/m3_sys_color_light_primary</item>
-    <item name="colorPrimaryDark">?attr/colorPrimary</item>
     <item name="colorOnPrimary">@color/m3_sys_color_light_on_primary</item>
     <item name="colorPrimaryInverse">@color/m3_sys_color_light_inverse_primary</item>
     <item name="colorPrimaryContainer">@color/m3_sys_color_light_primary_container</item>
@@ -68,6 +67,11 @@
     <item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
     <item name="android:textColorAlertDialogListItem">@color/m3_default_color_primary_text</item>
 
+    <!-- Deprecated Colors. -->
+    <item name="colorPrimaryDark">?attr/colorPrimary</item>
+    <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+    <item name="colorSecondaryVariant">?attr/colorSecondary</item>
+
     <!-- Widget styles. -->
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>
@@ -213,7 +217,6 @@
 
     <!-- Color palettes -->
     <item name="colorPrimary">@color/m3_sys_color_dark_primary</item>
-    <item name="colorPrimaryDark">?attr/colorPrimary</item>
     <item name="colorOnPrimary">@color/m3_sys_color_dark_on_primary</item>
     <item name="colorPrimaryInverse">@color/m3_sys_color_dark_inverse_primary</item>
     <item name="colorPrimaryContainer">@color/m3_sys_color_dark_primary_container</item>
@@ -257,6 +260,11 @@
     <item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
     <item name="android:textColorAlertDialogListItem">@color/m3_dark_default_color_primary_text</item>
 
+    <!-- Deprecated Colors. -->
+    <item name="colorPrimaryDark">?attr/colorPrimary</item>
+    <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+    <item name="colorSecondaryVariant">?attr/colorSecondary</item>
+
     <!-- Widget styles. -->
     <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
     <item name="badgeStyle">@style/Widget.Material3.Badge</item>

diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -24,7 +24,6 @@
 
     <!-- Color palettes -->
     <item name="colorPrimary">@color/m3_sys_color_light_primary</item>
-    <item name="colorPrimaryDark">?attr/colorPrimary</item>
     <item name="colorOnPrimary">@color/m3_sys_color_light_on_primary</item>
     <item name="colorPrimaryInverse">@color/m3_sys_color_light_inverse_primary</item>
     <item name="colorPrimaryContainer">@color/m3_sys_color_light_primary_container</item>
@@ -71,6 +70,11 @@
     <item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
     <item name="android:textColorAlertDialogListItem">@color/m3_default_color_primary_text</item>
 
+    <!-- Deprecated Colors. -->
+    <item name="colorPrimaryDark">?attr/colorPrimary</item>
+    <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+    <item name="colorSecondaryVariant">?attr/colorSecondary</item>
+
     <!-- Dialog themes. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
@@ -221,7 +225,6 @@
 
     <!-- Color palettes -->
     <item name="colorPrimary">@color/m3_sys_color_dark_primary</item>
-    <item name="colorPrimaryDark">?attr/colorPrimary</item>
     <item name="colorOnPrimary">@color/m3_sys_color_dark_on_primary</item>
     <item name="colorPrimaryInverse">@color/m3_sys_color_dark_inverse_primary</item>
     <item name="colorPrimaryContainer">@color/m3_sys_color_dark_primary_container</item>
@@ -268,6 +271,11 @@
     <item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
     <item name="android:textColorAlertDialogListItem">@color/m3_dark_default_color_primary_text</item>
 
+    <!-- Deprecated Colors. -->
+    <item name="colorPrimaryDark">?attr/colorPrimary</item>
+    <item name="colorPrimaryVariant">?attr/colorPrimary</item>
+    <item name="colorSecondaryVariant">?attr/colorSecondary</item>
+
     <!-- Dialog themes. -->
     <item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>