Skip to content

Commit 0c8fc41

Browse files
drchenpekingme
authored andcommitted
[M3][Color] Add missing M3 color attributes to public
Resolves #2538 PiperOrigin-RevId: 424403413
1 parent 1c5c054 commit 0c8fc41

File tree

1 file changed

+31
-5
lines changed
  • lib/java/com/google/android/material/color/res-public/values

1 file changed

+31
-5
lines changed

lib/java/com/google/android/material/color/res-public/values/public.xml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,44 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<public name="colorPrimaryVariant" type="attr"/>
19-
<public name="colorSecondary" type="attr"/>
20-
<public name="colorSecondaryVariant" type="attr"/>
21-
<public name="colorSurface" type="attr"/>
2218
<public name="colorOnPrimary" type="attr"/>
19+
<public name="colorPrimaryInverse" type="attr"/>
20+
<public name="colorPrimaryContainer" type="attr"/>
21+
<public name="colorOnPrimaryContainer" type="attr"/>
22+
23+
<public name="colorSecondary" type="attr"/>
2324
<public name="colorOnSecondary" type="attr"/>
25+
<public name="colorSecondaryContainer" type="attr"/>
26+
<public name="colorOnSecondaryContainer" type="attr"/>
27+
28+
<public name="colorTertiary" type="attr"/>
29+
<public name="colorOnTertiary" type="attr"/>
30+
<public name="colorTertiaryContainer" type="attr"/>
31+
<public name="colorOnTertiaryContainer" type="attr"/>
32+
2433
<public name="colorOnBackground" type="attr"/>
25-
<public name="colorOnError" type="attr"/>
34+
35+
<public name="colorSurface" type="attr"/>
2636
<public name="colorOnSurface" type="attr"/>
37+
<public name="colorSurfaceVariant" type="attr"/>
38+
<public name="colorOnSurfaceVariant" type="attr"/>
39+
<public name="colorSurfaceInverse" type="attr"/>
40+
<public name="colorOnSurfaceInverse" type="attr"/>
41+
42+
<public name="colorOutline" type="attr"/>
43+
44+
<public name="colorOnError" type="attr"/>
45+
<public name="colorErrorContainer" type="attr"/>
46+
<public name="colorOnErrorContainer" type="attr"/>
47+
2748
<public name="colorPrimarySurface" type="attr"/>
2849
<public name="colorOnPrimarySurface" type="attr"/>
50+
2951
<public name="scrimBackground" type="attr"/>
3052

53+
<public name="colorPrimaryVariant" type="attr"/>
54+
<public name="colorSecondaryVariant" type="attr"/>
55+
3156
<public name="design_default_color_primary" type="color"/>
3257
<public name="design_default_color_primary_dark" type="color"/>
3358
<public name="design_default_color_primary_variant" type="color"/>
@@ -54,6 +79,7 @@
5479
<public name="material_emphasis_disabled_background" type="dimen"/>
5580

5681
<public name="useMaterialThemeColors" type="attr"/>
82+
<public name="dynamicColorThemeOverlay" type="attr"/>
5783

5884
<public name="material_dynamic_primary0" type="color"/>
5985
<public name="material_dynamic_primary10" type="color"/>

0 commit comments

Comments
 (0)