Skip to content

Commit

Permalink
[Tokens][Cleanup] Better ordering in the output.
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 430479085
  • Loading branch information
@pekingme @hunterstich
pekingme authored and hunterstich committed Feb 23, 2022
1 parent b25807c commit 37fcd24
Show file tree
Hide file tree
Showing 6 changed files with 403 additions and 403 deletions.
192 changes: 96 additions & 96 deletions lib/java/com/google/android/material/color/res/values-v31/tokens.xml
View file

Large diffs are not rendered by default.

240 changes: 120 additions & 120 deletions lib/java/com/google/android/material/color/res/values/tokens.xml
View file
Expand Up @@ -19,156 +19,156 @@

<resources>
<!-- Generated from token set (md.sys.color) in context (theme=dark). -->
<!-- Error colors -->
<color name="m3_sys_color_dark_error">@color/m3_ref_palette_error80</color>
<color name="m3_sys_color_dark_on_error">@color/m3_ref_palette_error20</color>
<color name="m3_sys_color_dark_error_container">@color/m3_ref_palette_error30</color>
<color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error80</color>
<!-- Primary colors -->
<color name="m3_sys_color_dark_primary">@color/m3_ref_palette_primary80</color>
<color name="m3_sys_color_dark_on_primary">@color/m3_ref_palette_primary20</color>
<color name="m3_sys_color_dark_inverse_primary">@color/m3_ref_palette_primary40</color>
<color name="m3_sys_color_dark_primary_container">@color/m3_ref_palette_primary30</color>
<color name="m3_sys_color_dark_on_primary">@color/m3_ref_palette_primary20</color>
<color name="m3_sys_color_dark_on_primary_container">@color/m3_ref_palette_primary90</color>
<color name="m3_sys_color_dark_inverse_primary">@color/m3_ref_palette_primary40</color>
<!-- Secondary colors -->
<color name="m3_sys_color_dark_secondary">@color/m3_ref_palette_secondary80</color>
<color name="m3_sys_color_dark_secondary_container">@color/m3_ref_palette_secondary30</color>
<color name="m3_sys_color_dark_on_secondary">@color/m3_ref_palette_secondary20</color>
<color name="m3_sys_color_dark_on_secondary_container">@color/m3_ref_palette_secondary90</color>
<!-- Tertiary colors -->
<color name="m3_sys_color_dark_tertiary">@color/m3_ref_palette_tertiary80</color>
<color name="m3_sys_color_dark_tertiary_container">@color/m3_ref_palette_tertiary30</color>
<color name="m3_sys_color_dark_on_tertiary">@color/m3_ref_palette_tertiary20</color>
<color name="m3_sys_color_dark_on_tertiary_container">@color/m3_ref_palette_tertiary90</color>
<!-- Surface colors -->
<color name="m3_sys_color_dark_surface">@color/m3_ref_palette_neutral10</color>
<color name="m3_sys_color_dark_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
<color name="m3_sys_color_dark_on_surface">@color/m3_ref_palette_neutral90</color>
<color name="m3_sys_color_dark_on_surface_variant">@color/m3_ref_palette_neutral_variant80</color>
<color name="m3_sys_color_dark_inverse_surface">@color/m3_ref_palette_neutral90</color>
<color name="m3_sys_color_dark_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
<color name="m3_sys_color_dark_inverse_on_surface">@color/m3_ref_palette_neutral20</color>
<color name="m3_sys_color_dark_on_surface_variant">@color/m3_ref_palette_neutral_variant80</color>
<!-- Hairline colors -->
<color name="m3_sys_color_dark_outline">@color/m3_ref_palette_neutral_variant60</color>
<!-- Tertiary colors -->
<color name="m3_sys_color_dark_tertiary">@color/m3_ref_palette_tertiary80</color>
<color name="m3_sys_color_dark_on_tertiary">@color/m3_ref_palette_tertiary20</color>
<color name="m3_sys_color_dark_tertiary_container">@color/m3_ref_palette_tertiary30</color>
<color name="m3_sys_color_dark_on_tertiary_container">@color/m3_ref_palette_tertiary90</color>
<!-- Secondary colors -->
<color name="m3_sys_color_dark_secondary">@color/m3_ref_palette_secondary80</color>
<color name="m3_sys_color_dark_on_secondary">@color/m3_ref_palette_secondary20</color>
<color name="m3_sys_color_dark_secondary_container">@color/m3_ref_palette_secondary30</color>
<color name="m3_sys_color_dark_on_secondary_container">@color/m3_ref_palette_secondary90</color>
<!-- Background colors -->
<color name="m3_sys_color_dark_background">@color/m3_ref_palette_neutral10</color>
<color name="m3_sys_color_dark_on_background">@color/m3_ref_palette_neutral90</color>
<!-- Generated from token set (md.sys.color) in context (theme=light). -->
<!-- Hairline colors -->
<color name="m3_sys_color_dark_outline">@color/m3_ref_palette_neutral_variant60</color>
<!-- Error colors -->
<color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
<color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
<color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
<color name="m3_sys_color_dark_error">@color/m3_ref_palette_error80</color>
<color name="m3_sys_color_dark_error_container">@color/m3_ref_palette_error30</color>
<color name="m3_sys_color_dark_on_error">@color/m3_ref_palette_error20</color>
<color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error80</color>
<!-- Generated from token set (md.sys.color) in context (theme=light). -->
<!-- Primary colors -->
<color name="m3_sys_color_light_primary">@color/m3_ref_palette_primary40</color>
<color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
<color name="m3_sys_color_light_inverse_primary">@color/m3_ref_palette_primary80</color>
<color name="m3_sys_color_light_primary_container">@color/m3_ref_palette_primary90</color>
<color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
<color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary10</color>
<color name="m3_sys_color_light_inverse_primary">@color/m3_ref_palette_primary80</color>
<!-- Secondary colors -->
<color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
<color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
<color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
<!-- Tertiary colors -->
<color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
<color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
<color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
<!-- Surface colors -->
<color name="m3_sys_color_light_surface">@color/m3_ref_palette_neutral99</color>
<color name="m3_sys_color_light_surface_variant">@color/m3_ref_palette_neutral_variant90</color>
<color name="m3_sys_color_light_on_surface">@color/m3_ref_palette_neutral10</color>
<color name="m3_sys_color_light_on_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
<color name="m3_sys_color_light_inverse_surface">@color/m3_ref_palette_neutral20</color>
<color name="m3_sys_color_light_surface_variant">@color/m3_ref_palette_neutral_variant90</color>
<color name="m3_sys_color_light_inverse_on_surface">@color/m3_ref_palette_neutral95</color>
<color name="m3_sys_color_light_on_surface_variant">@color/m3_ref_palette_neutral_variant30</color>
<!-- Hairline colors -->
<color name="m3_sys_color_light_outline">@color/m3_ref_palette_neutral_variant50</color>
<!-- Tertiary colors -->
<color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
<color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
<color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
<!-- Secondary colors -->
<color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
<color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
<color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
<!-- Background colors -->
<color name="m3_sys_color_light_background">@color/m3_ref_palette_neutral99</color>
<color name="m3_sys_color_light_on_background">@color/m3_ref_palette_neutral10</color>
<!-- Hairline colors -->
<color name="m3_sys_color_light_outline">@color/m3_ref_palette_neutral_variant50</color>
<!-- Error colors -->
<color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
<color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
<color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
<!-- Generated from token set (md.ref.palette) in context (audience=3p). -->
<!-- Baseline palette – Error -->
<color name="m3_ref_palette_error0">#ff000000</color>
<color name="m3_ref_palette_error10">#ff410e0b</color>
<color name="m3_ref_palette_error20">#ff601410</color>
<color name="m3_ref_palette_error30">#ff8c1d18</color>
<color name="m3_ref_palette_error40">#ffb3261e</color>
<color name="m3_ref_palette_error50">#ffdc362e</color>
<color name="m3_ref_palette_error60">#ffe46962</color>
<color name="m3_ref_palette_error70">#ffec928e</color>
<color name="m3_ref_palette_error80">#fff2b8b5</color>
<color name="m3_ref_palette_error90">#fff9dedc</color>
<color name="m3_ref_palette_error95">#fffceeee</color>
<color name="m3_ref_palette_error99">#fffffbf9</color>
<color name="m3_ref_palette_error100">#ffffffff</color>
<!-- Baseline palette – Neutral -->
<color name="m3_ref_palette_neutral0">#ff000000</color>
<color name="m3_ref_palette_neutral10">#ff1c1b1f</color>
<color name="m3_ref_palette_neutral20">#ff313033</color>
<color name="m3_ref_palette_neutral30">#ff484649</color>
<color name="m3_ref_palette_neutral40">#ff605d62</color>
<color name="m3_ref_palette_neutral50">#ff787579</color>
<color name="m3_ref_palette_neutral60">#ff939094</color>
<color name="m3_ref_palette_neutral70">#ffaeaaae</color>
<color name="m3_ref_palette_neutral80">#ffc9c5ca</color>
<color name="m3_ref_palette_neutral90">#ffe6e1e5</color>
<color name="m3_ref_palette_neutral95">#fff4eff4</color>
<color name="m3_ref_palette_neutral99">#fffffbfe</color>
<color name="m3_ref_palette_neutral100">#ffffffff</color>
<!-- Baseline palette – Primary -->
<color name="m3_ref_palette_primary0">#ff000000</color>
<color name="m3_ref_palette_primary10">#ff21005d</color>
<color name="m3_ref_palette_primary20">#ff381e72</color>
<color name="m3_ref_palette_primary30">#ff4f378b</color>
<color name="m3_ref_palette_primary40">#ff6750a4</color>
<color name="m3_ref_palette_primary50">#ff7f67be</color>
<color name="m3_ref_palette_primary60">#ff9a82db</color>
<color name="m3_ref_palette_primary70">#ffb69df8</color>
<color name="m3_ref_palette_primary80">#ffd0bcff</color>
<color name="m3_ref_palette_primary90">#ffeaddff</color>
<color name="m3_ref_palette_primary95">#fff6edff</color>
<color name="m3_ref_palette_primary99">#fffffbfe</color>
<color name="m3_ref_palette_primary100">#ffffffff</color>
<!-- Baseline palette – Tertiary -->
<color name="m3_ref_palette_tertiary0">#ff000000</color>
<color name="m3_ref_palette_tertiary10">#ff31111d</color>
<color name="m3_ref_palette_tertiary20">#ff492532</color>
<color name="m3_ref_palette_tertiary30">#ff633b48</color>
<color name="m3_ref_palette_tertiary40">#ff7d5260</color>
<color name="m3_ref_palette_tertiary50">#ff986977</color>
<color name="m3_ref_palette_tertiary60">#ffb58392</color>
<color name="m3_ref_palette_tertiary70">#ffd29dac</color>
<color name="m3_ref_palette_tertiary80">#ffefb8c8</color>
<color name="m3_ref_palette_tertiary90">#ffffd8e4</color>
<color name="m3_ref_palette_tertiary95">#ffffecf1</color>
<color name="m3_ref_palette_tertiary99">#fffffbfa</color>
<color name="m3_ref_palette_tertiary100">#ffffffff</color>
<color name="m3_ref_palette_primary99">#fffffbfe</color>
<color name="m3_ref_palette_primary95">#fff6edff</color>
<color name="m3_ref_palette_primary90">#ffeaddff</color>
<color name="m3_ref_palette_primary80">#ffd0bcff</color>
<color name="m3_ref_palette_primary70">#ffb69df8</color>
<color name="m3_ref_palette_primary60">#ff9a82db</color>
<color name="m3_ref_palette_primary50">#ff7f67be</color>
<color name="m3_ref_palette_primary40">#ff6750a4</color>
<color name="m3_ref_palette_primary30">#ff4f378b</color>
<color name="m3_ref_palette_primary20">#ff381e72</color>
<color name="m3_ref_palette_primary10">#ff21005d</color>
<color name="m3_ref_palette_primary0">#ff000000</color>
<!-- Baseline palette – Secondary -->
<color name="m3_ref_palette_secondary0">#ff000000</color>
<color name="m3_ref_palette_secondary10">#ff1d192b</color>
<color name="m3_ref_palette_secondary20">#ff332d41</color>
<color name="m3_ref_palette_secondary30">#ff4a4458</color>
<color name="m3_ref_palette_secondary40">#ff625b71</color>
<color name="m3_ref_palette_secondary50">#ff7a7289</color>
<color name="m3_ref_palette_secondary60">#ff958da5</color>
<color name="m3_ref_palette_secondary70">#ffb0a7c0</color>
<color name="m3_ref_palette_secondary80">#ffccc2dc</color>
<color name="m3_ref_palette_secondary90">#ffe8def8</color>
<color name="m3_ref_palette_secondary95">#fff6edff</color>
<color name="m3_ref_palette_secondary99">#fffffbfe</color>
<color name="m3_ref_palette_secondary100">#ffffffff</color>
<color name="m3_ref_palette_secondary99">#fffffbfe</color>
<color name="m3_ref_palette_secondary95">#fff6edff</color>
<color name="m3_ref_palette_secondary90">#ffe8def8</color>
<color name="m3_ref_palette_secondary80">#ffccc2dc</color>
<color name="m3_ref_palette_secondary70">#ffb0a7c0</color>
<color name="m3_ref_palette_secondary60">#ff958da5</color>
<color name="m3_ref_palette_secondary50">#ff7a7289</color>
<color name="m3_ref_palette_secondary40">#ff625b71</color>
<color name="m3_ref_palette_secondary30">#ff4a4458</color>
<color name="m3_ref_palette_secondary20">#ff332d41</color>
<color name="m3_ref_palette_secondary10">#ff1d192b</color>
<color name="m3_ref_palette_secondary0">#ff000000</color>
<!-- Baseline palette – Tertiary -->
<color name="m3_ref_palette_tertiary100">#ffffffff</color>
<color name="m3_ref_palette_tertiary99">#fffffbfa</color>
<color name="m3_ref_palette_tertiary95">#ffffecf1</color>
<color name="m3_ref_palette_tertiary90">#ffffd8e4</color>
<color name="m3_ref_palette_tertiary80">#ffefb8c8</color>
<color name="m3_ref_palette_tertiary70">#ffd29dac</color>
<color name="m3_ref_palette_tertiary60">#ffb58392</color>
<color name="m3_ref_palette_tertiary50">#ff986977</color>
<color name="m3_ref_palette_tertiary40">#ff7d5260</color>
<color name="m3_ref_palette_tertiary30">#ff633b48</color>
<color name="m3_ref_palette_tertiary20">#ff492532</color>
<color name="m3_ref_palette_tertiary10">#ff31111d</color>
<color name="m3_ref_palette_tertiary0">#ff000000</color>
<!-- Baseline palette – Error -->
<color name="m3_ref_palette_error100">#ffffffff</color>
<color name="m3_ref_palette_error99">#fffffbf9</color>
<color name="m3_ref_palette_error95">#fffceeee</color>
<color name="m3_ref_palette_error90">#fff9dedc</color>
<color name="m3_ref_palette_error80">#fff2b8b5</color>
<color name="m3_ref_palette_error70">#ffec928e</color>
<color name="m3_ref_palette_error60">#ffe46962</color>
<color name="m3_ref_palette_error50">#ffdc362e</color>
<color name="m3_ref_palette_error40">#ffb3261e</color>
<color name="m3_ref_palette_error30">#ff8c1d18</color>
<color name="m3_ref_palette_error20">#ff601410</color>
<color name="m3_ref_palette_error10">#ff410e0b</color>
<color name="m3_ref_palette_error0">#ff000000</color>
<!-- Baseline palette – Neutral -->
<color name="m3_ref_palette_neutral100">#ffffffff</color>
<color name="m3_ref_palette_neutral99">#fffffbfe</color>
<color name="m3_ref_palette_neutral95">#fff4eff4</color>
<color name="m3_ref_palette_neutral90">#ffe6e1e5</color>
<color name="m3_ref_palette_neutral80">#ffc9c5ca</color>
<color name="m3_ref_palette_neutral70">#ffaeaaae</color>
<color name="m3_ref_palette_neutral60">#ff939094</color>
<color name="m3_ref_palette_neutral50">#ff787579</color>
<color name="m3_ref_palette_neutral40">#ff605d62</color>
<color name="m3_ref_palette_neutral30">#ff484649</color>
<color name="m3_ref_palette_neutral20">#ff313033</color>
<color name="m3_ref_palette_neutral10">#ff1c1b1f</color>
<color name="m3_ref_palette_neutral0">#ff000000</color>
<!-- Baseline palette – Neutral variant -->
<color name="m3_ref_palette_neutral_variant0">#ff000000</color>
<color name="m3_ref_palette_neutral_variant10">#ff1d1a22</color>
<color name="m3_ref_palette_neutral_variant20">#ff322f37</color>
<color name="m3_ref_palette_neutral_variant30">#ff49454f</color>
<color name="m3_ref_palette_neutral_variant40">#ff605d66</color>
<color name="m3_ref_palette_neutral_variant50">#ff79747e</color>
<color name="m3_ref_palette_neutral_variant60">#ff938f99</color>
<color name="m3_ref_palette_neutral_variant70">#ffaea9b4</color>
<color name="m3_ref_palette_neutral_variant80">#ffcac4d0</color>
<color name="m3_ref_palette_neutral_variant90">#ffe7e0ec</color>
<color name="m3_ref_palette_neutral_variant95">#fff5eefa</color>
<color name="m3_ref_palette_neutral_variant99">#fffffbfe</color>
<color name="m3_ref_palette_neutral_variant100">#ffffffff</color>
<color name="m3_ref_palette_neutral_variant99">#fffffbfe</color>
<color name="m3_ref_palette_neutral_variant95">#fff5eefa</color>
<color name="m3_ref_palette_neutral_variant90">#ffe7e0ec</color>
<color name="m3_ref_palette_neutral_variant80">#ffcac4d0</color>
<color name="m3_ref_palette_neutral_variant70">#ffaea9b4</color>
<color name="m3_ref_palette_neutral_variant60">#ff938f99</color>
<color name="m3_ref_palette_neutral_variant50">#ff79747e</color>
<color name="m3_ref_palette_neutral_variant40">#ff605d66</color>
<color name="m3_ref_palette_neutral_variant30">#ff49454f</color>
<color name="m3_ref_palette_neutral_variant20">#ff322f37</color>
<color name="m3_ref_palette_neutral_variant10">#ff1d1a22</color>
<color name="m3_ref_palette_neutral_variant0">#ff000000</color>
</resources>
4 changes: 2 additions & 2 deletions lib/java/com/google/android/material/motion/res/values/tokens.xml
View file
Expand Up @@ -48,12 +48,12 @@
<string name="m3_sys_motion_easing_emphasized_accelerate" translatable="false">cubic-bezier(0.3, 0.0, 0.8, 0.2)</string>
<string name="m3_sys_motion_easing_emphasized_decelerate" translatable="false">cubic-bezier(0.1, 0.7, 0.1, 1.0)</string>
<!-- Deprecated tokens -->
<integer name="m3_sys_motion_duration_long1">500</integer>
<integer name="m3_sys_motion_duration_long2">600</integer>
<integer name="m3_sys_motion_duration_short1">100</integer>
<integer name="m3_sys_motion_duration_short2">200</integer>
<integer name="m3_sys_motion_duration_medium1">300</integer>
<integer name="m3_sys_motion_duration_medium2">400</integer>
<integer name="m3_sys_motion_duration_long1">500</integer>
<integer name="m3_sys_motion_duration_long2">600</integer>
<string name="m3_sys_motion_easing_accelerated" translatable="false">cubic-bezier(0.4, 0.0, 1.0, 1.0)</string>
<string name="m3_sys_motion_easing_decelerated" translatable="false">cubic-bezier(0.0, 0.0, 0.2, 1.0)</string>
</resources>
8 changes: 4 additions & 4 deletions lib/java/com/google/android/material/shape/res/values/tokens.xml
View file
Expand Up @@ -76,12 +76,12 @@
<item name="cornerFamily">rounded</item>
<item name="cornerSize">8dp</item>
</style>
<style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">4dp</item>
</style>
<style name="ShapeAppearance.M3.Sys.Shape.Medium" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">8dp</item>
</style>
<style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">4dp</item>
</style>
</resources>

0 comments on commit 37fcd24

Please sign in to comment.