Skip to content

Commit

Permalink
[M3][Color] Move dynamic color public resources to all versions
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 407141799
(cherry picked from commit a455a53)
  • Loading branch information
@drchen
drchen committed Nov 11, 2021
1 parent 59ca95b commit 34c068f
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 88 deletions.
88 changes: 0 additions & 88 deletions lib/java/com/google/android/material/color/res-public/values-v31/public.xml
View file

This file was deleted.

70 changes: 70 additions & 0 deletions lib/java/com/google/android/material/color/res-public/values/public.xml
View file
Expand Up @@ -54,4 +54,74 @@
<public name="material_emphasis_disabled_background" type="dimen"/>

<public name="useMaterialThemeColors" type="attr"/>

<public name="material_dynamic_primary0" type="color"/>
<public name="material_dynamic_primary10" type="color"/>
<public name="material_dynamic_primary20" type="color"/>
<public name="material_dynamic_primary30" type="color"/>
<public name="material_dynamic_primary40" type="color"/>
<public name="material_dynamic_primary50" type="color"/>
<public name="material_dynamic_primary60" type="color"/>
<public name="material_dynamic_primary70" type="color"/>
<public name="material_dynamic_primary80" type="color"/>
<public name="material_dynamic_primary90" type="color"/>
<public name="material_dynamic_primary95" type="color"/>
<public name="material_dynamic_primary99" type="color"/>
<public name="material_dynamic_primary100" type="color"/>

<public name="material_dynamic_secondary0" type="color"/>
<public name="material_dynamic_secondary10" type="color"/>
<public name="material_dynamic_secondary20" type="color"/>
<public name="material_dynamic_secondary30" type="color"/>
<public name="material_dynamic_secondary40" type="color"/>
<public name="material_dynamic_secondary50" type="color"/>
<public name="material_dynamic_secondary60" type="color"/>
<public name="material_dynamic_secondary70" type="color"/>
<public name="material_dynamic_secondary80" type="color"/>
<public name="material_dynamic_secondary90" type="color"/>
<public name="material_dynamic_secondary95" type="color"/>
<public name="material_dynamic_secondary99" type="color"/>
<public name="material_dynamic_secondary100" type="color"/>

<public name="material_dynamic_tertiary0" type="color"/>
<public name="material_dynamic_tertiary10" type="color"/>
<public name="material_dynamic_tertiary20" type="color"/>
<public name="material_dynamic_tertiary30" type="color"/>
<public name="material_dynamic_tertiary40" type="color"/>
<public name="material_dynamic_tertiary50" type="color"/>
<public name="material_dynamic_tertiary60" type="color"/>
<public name="material_dynamic_tertiary70" type="color"/>
<public name="material_dynamic_tertiary80" type="color"/>
<public name="material_dynamic_tertiary90" type="color"/>
<public name="material_dynamic_tertiary95" type="color"/>
<public name="material_dynamic_tertiary99" type="color"/>
<public name="material_dynamic_tertiary100" type="color"/>

<public name="material_dynamic_neutral0" type="color"/>
<public name="material_dynamic_neutral10" type="color"/>
<public name="material_dynamic_neutral20" type="color"/>
<public name="material_dynamic_neutral30" type="color"/>
<public name="material_dynamic_neutral40" type="color"/>
<public name="material_dynamic_neutral50" type="color"/>
<public name="material_dynamic_neutral60" type="color"/>
<public name="material_dynamic_neutral70" type="color"/>
<public name="material_dynamic_neutral80" type="color"/>
<public name="material_dynamic_neutral90" type="color"/>
<public name="material_dynamic_neutral95" type="color"/>
<public name="material_dynamic_neutral99" type="color"/>
<public name="material_dynamic_neutral100" type="color"/>

<public name="material_dynamic_neutral_variant0" type="color"/>
<public name="material_dynamic_neutral_variant10" type="color"/>
<public name="material_dynamic_neutral_variant20" type="color"/>
<public name="material_dynamic_neutral_variant30" type="color"/>
<public name="material_dynamic_neutral_variant40" type="color"/>
<public name="material_dynamic_neutral_variant50" type="color"/>
<public name="material_dynamic_neutral_variant60" type="color"/>
<public name="material_dynamic_neutral_variant70" type="color"/>
<public name="material_dynamic_neutral_variant80" type="color"/>
<public name="material_dynamic_neutral_variant90" type="color"/>
<public name="material_dynamic_neutral_variant95" type="color"/>
<public name="material_dynamic_neutral_variant99" type="color"/>
<public name="material_dynamic_neutral_variant100" type="color"/>
</resources>

1 comment on commit 34c068f

@PaulWoitaschek
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just faced a crash by using these on api < 31 with components 1.5.

Why were these moved without a default implementation?

Please sign in to comment.