Skip to content

Commit 6e250a6

Browse files
cketchamdsn5ft
authored andcommitted
Add colorSecondary to bridge themes
PiperOrigin-RevId: 250495874
1 parent b247e00 commit 6e250a6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<item name="isMaterialTheme">true</item>
3535

3636
<item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
37+
<item name="colorSecondary">@color/design_dark_default_color_secondary</item>
3738
<item name="colorSecondaryVariant">@color/design_dark_default_color_secondary_variant</item>
3839
<item name="colorSurface">@color/design_dark_default_color_surface</item>
3940
<item name="colorOnPrimary">@color/design_dark_default_color_on_primary</item>
@@ -79,6 +80,7 @@
7980
<item name="isMaterialTheme">true</item>
8081

8182
<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
83+
<item name="colorSecondary">@color/design_default_color_secondary</item>
8284
<item name="colorSecondaryVariant">@color/design_default_color_secondary_variant</item>
8385
<item name="colorSurface">@color/design_default_color_surface</item>
8486
<item name="colorOnPrimary">@color/design_default_color_on_primary</item>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<!-- Colors -->
2626
<item name="colorPrimary">@color/design_dark_default_color_primary</item>
2727
<item name="colorPrimaryDark">@color/design_dark_default_color_primary_dark</item>
28-
<item name="colorSecondary">@color/design_dark_default_color_secondary</item>
2928
<item name="colorAccent">?attr/colorSecondary</item>
3029

3130
<item name="android:colorBackground">@color/design_dark_default_color_background</item>
@@ -91,7 +90,6 @@
9190
<!-- Colors -->
9291
<item name="colorPrimary">@color/design_default_color_primary</item>
9392
<item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
94-
<item name="colorSecondary">@color/design_default_color_secondary</item>
9593
<item name="colorAccent">?attr/colorSecondary</item>
9694

9795
<item name="android:colorBackground">@color/design_default_color_background</item>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<item name="isMaterialTheme">true</item>
3535

3636
<item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
37+
<item name="colorSecondary">@color/design_dark_default_color_secondary</item>
3738
<item name="colorSecondaryVariant">@color/design_dark_default_color_secondary_variant</item>
3839
<item name="colorSurface">@color/design_dark_default_color_surface</item>
3940
<item name="colorOnPrimary">@color/design_dark_default_color_on_primary</item>
@@ -79,6 +80,7 @@
7980
<item name="isMaterialTheme">true</item>
8081

8182
<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
83+
<item name="colorSecondary">@color/design_default_color_secondary</item>
8284
<item name="colorSecondaryVariant">@color/design_default_color_secondary_variant</item>
8385
<item name="colorSurface">@color/design_default_color_surface</item>
8486
<item name="colorOnPrimary">@color/design_default_color_on_primary</item>
@@ -124,6 +126,7 @@
124126
<item name="isMaterialTheme">true</item>
125127

126128
<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
129+
<item name="colorSecondary">@color/design_default_color_secondary</item>
127130
<item name="colorSecondaryVariant">@color/design_default_color_secondary_variant</item>
128131
<item name="colorSurface">@color/design_default_color_surface</item>
129132
<item name="colorOnPrimary">@color/design_default_color_on_primary</item>
@@ -132,8 +135,6 @@
132135
<item name="colorOnError">@color/design_default_color_on_error</item>
133136
<item name="colorOnSurface">@color/design_default_color_on_surface</item>
134137

135-
<item name="colorSecondary">?attr/colorPrimary</item>
136-
137138
<item name="scrimBackground">@color/mtrl_scrim_color</item>
138139

139140
<!-- Type styles -->

0 commit comments

Comments
 (0)