Skip to content

Commit a43d7d9

Browse files
drchenafohrman
authored andcommitted
[M3][Theme] Internal change
PiperOrigin-RevId: 419602208
1 parent 8bc6420 commit a43d7d9

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

lib/java/com/google/android/material/dialog/res/values/themes_base.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<!-- Color palettes -->
2626
<item name="colorPrimary">@color/m3_sys_color_light_primary</item>
27-
<item name="colorPrimaryDark">?attr/colorPrimary</item>
2827
<item name="colorOnPrimary">@color/m3_sys_color_light_on_primary</item>
2928
<item name="colorPrimaryInverse">@color/m3_sys_color_light_inverse_primary</item>
3029
<item name="colorPrimaryContainer">@color/m3_sys_color_light_primary_container</item>
@@ -68,6 +67,11 @@
6867
<item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
6968
<item name="android:textColorAlertDialogListItem">@color/m3_default_color_primary_text</item>
7069

70+
<!-- Deprecated Colors. -->
71+
<item name="colorPrimaryDark">?attr/colorPrimary</item>
72+
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
73+
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
74+
7175
<!-- Widget styles. -->
7276
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
7377
<item name="badgeStyle">@style/Widget.Material3.Badge</item>
@@ -213,7 +217,6 @@
213217

214218
<!-- Color palettes -->
215219
<item name="colorPrimary">@color/m3_sys_color_dark_primary</item>
216-
<item name="colorPrimaryDark">?attr/colorPrimary</item>
217220
<item name="colorOnPrimary">@color/m3_sys_color_dark_on_primary</item>
218221
<item name="colorPrimaryInverse">@color/m3_sys_color_dark_inverse_primary</item>
219222
<item name="colorPrimaryContainer">@color/m3_sys_color_dark_primary_container</item>
@@ -257,6 +260,11 @@
257260
<item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
258261
<item name="android:textColorAlertDialogListItem">@color/m3_dark_default_color_primary_text</item>
259262

263+
<!-- Deprecated Colors. -->
264+
<item name="colorPrimaryDark">?attr/colorPrimary</item>
265+
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
266+
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
267+
260268
<!-- Widget styles. -->
261269
<item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
262270
<item name="badgeStyle">@style/Widget.Material3.Badge</item>

lib/java/com/google/android/material/theme/res/values/themes_base.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<!-- Color palettes -->
2626
<item name="colorPrimary">@color/m3_sys_color_light_primary</item>
27-
<item name="colorPrimaryDark">?attr/colorPrimary</item>
2827
<item name="colorOnPrimary">@color/m3_sys_color_light_on_primary</item>
2928
<item name="colorPrimaryInverse">@color/m3_sys_color_light_inverse_primary</item>
3029
<item name="colorPrimaryContainer">@color/m3_sys_color_light_primary_container</item>
@@ -71,6 +70,11 @@
7170
<item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
7271
<item name="android:textColorAlertDialogListItem">@color/m3_default_color_primary_text</item>
7372

73+
<!-- Deprecated Colors. -->
74+
<item name="colorPrimaryDark">?attr/colorPrimary</item>
75+
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
76+
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
77+
7478
<!-- Dialog themes. -->
7579
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
7680
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>
@@ -221,7 +225,6 @@
221225

222226
<!-- Color palettes -->
223227
<item name="colorPrimary">@color/m3_sys_color_dark_primary</item>
224-
<item name="colorPrimaryDark">?attr/colorPrimary</item>
225228
<item name="colorOnPrimary">@color/m3_sys_color_dark_on_primary</item>
226229
<item name="colorPrimaryInverse">@color/m3_sys_color_dark_inverse_primary</item>
227230
<item name="colorPrimaryContainer">@color/m3_sys_color_dark_primary_container</item>
@@ -268,6 +271,11 @@
268271
<item name="android:textColorLinkInverse">?attr/colorPrimaryInverse</item>
269272
<item name="android:textColorAlertDialogListItem">@color/m3_dark_default_color_primary_text</item>
270273

274+
<!-- Deprecated Colors. -->
275+
<item name="colorPrimaryDark">?attr/colorPrimary</item>
276+
<item name="colorPrimaryVariant">?attr/colorPrimary</item>
277+
<item name="colorSecondaryVariant">?attr/colorSecondary</item>
278+
271279
<!-- Dialog themes. -->
272280
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.Dialog.Alert</item>
273281
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Material3.BottomSheetDialog</item>

0 commit comments

Comments
 (0)