Updated tokens to v0.88. (#99568)

darrenaustin · web-flow · commit bb1b2fd07277 · 2022-03-08T13:08:36.000-08:00
Also added the Card tokens to the exported list.
diff --git a/dev/tools/gen_defaults/bin/gen_defaults.dart b/dev/tools/gen_defaults/bin/gen_defaults.dart
@@ -35,14 +35,17 @@ Future<void> main(List<String> args) async {
     'color_light.json',
     'dialog.json',
     'elevation.json',
+    'elevated_card.json',
     'fab_extended_primary.json',
     'fab_large_primary.json',
     'fab_primary.json',
     'fab_small_primary.json',
+    'filled_card.json',
     'filter_chip.json',
     'input_chip.json',
     'motion.json',
     'navigation_bar.json',
+    'outlined_card.json',
     'palette.json',
     'shape.json',
     'slider.json',
diff --git a/dev/tools/gen_defaults/data/assist_chip.json b/dev/tools/gen_defaults/data/assist_chip.json
@@ -1,9 +1,9 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.assist-chip.container.height": 32.0,
   "md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",
-  "md.comp.assist-chip.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.assist-chip.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.assist-chip.disabled.label-text.color": "onSurface",
   "md.comp.assist-chip.disabled.label-text.opacity": 0.38,
   "md.comp.assist-chip.dragged.container.elevation": "md.sys.elevation.level4",
diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.banner.action.focus.label-text.color": "primary",
   "md.comp.banner.action.focus.state-layer.color": "primary",
@@ -15,7 +15,7 @@
   "md.comp.banner.container.color": "surface",
   "md.comp.banner.container.elevation": "md.sys.elevation.level1",
   "md.comp.banner.container.shape": "md.sys.shape.corner.none",
-  "md.comp.banner.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.banner.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.banner.desktop.with-single-line.container.height": 52.0,
   "md.comp.banner.desktop.with-three-lines.container.height": 90.0,
   "md.comp.banner.desktop.with-two-lines.with-image.container.height": 72.0,
diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.color.background": "md.ref.palette.neutral10",
   "md.sys.color.error": "md.ref.palette.error80",
@@ -25,7 +25,7 @@
   "md.sys.color.secondary-container": "md.ref.palette.secondary30",
   "md.sys.color.shadow": "md.ref.palette.neutral0",
   "md.sys.color.surface": "md.ref.palette.neutral10",
-  "md.sys.color.surface-tint-color": "primary",
+  "md.sys.color.surface-tint": "primary",
   "md.sys.color.surface-variant": "md.ref.palette.neutral-variant30",
   "md.sys.color.tertiary": "md.ref.palette.tertiary80",
   "md.sys.color.tertiary-container": "md.ref.palette.tertiary30"
diff --git a/dev/tools/gen_defaults/data/color_light.json b/dev/tools/gen_defaults/data/color_light.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.color.background": "md.ref.palette.neutral99",
   "md.sys.color.error": "md.ref.palette.error40",
@@ -25,7 +25,7 @@
   "md.sys.color.secondary-container": "md.ref.palette.secondary90",
   "md.sys.color.shadow": "md.ref.palette.neutral0",
   "md.sys.color.surface": "md.ref.palette.neutral99",
-  "md.sys.color.surface-tint-color": "primary",
+  "md.sys.color.surface-tint": "primary",
   "md.sys.color.surface-variant": "md.ref.palette.neutral-variant90",
   "md.sys.color.tertiary": "md.ref.palette.tertiary40",
   "md.sys.color.tertiary-container": "md.ref.palette.tertiary90"
diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.dialog.action.focus.label-text.color": "primary",
   "md.comp.dialog.action.focus.state-layer.color": "primary",
@@ -15,7 +15,7 @@
   "md.comp.dialog.container.color": "surface",
   "md.comp.dialog.container.elevation": "md.sys.elevation.level3",
   "md.comp.dialog.container.shape": "md.sys.shape.corner.extra-large",
-  "md.comp.dialog.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.dialog.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.dialog.subhead.color": "onSurface",
   "md.comp.dialog.subhead.text-style": "headlineSmall",
   "md.comp.dialog.supporting-text.color": "onSurfaceVariant",
diff --git a/dev/tools/gen_defaults/data/elevated_card.json b/dev/tools/gen_defaults/data/elevated_card.json
@@ -0,0 +1,23 @@
+{
+  "version": "v0_88",
+
+  "md.comp.elevated-card.container.color": "surface",
+  "md.comp.elevated-card.container.elevation": "md.sys.elevation.level1",
+  "md.comp.elevated-card.container.shadow-color": "shadow",
+  "md.comp.elevated-card.container.shape": "md.sys.shape.corner.medium",
+  "md.comp.elevated-card.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.elevated-card.dragged.container.elevation": "md.sys.elevation.level4",
+  "md.comp.elevated-card.dragged.state-layer.color": "onSurface",
+  "md.comp.elevated-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
+  "md.comp.elevated-card.focus.container.elevation": "md.sys.elevation.level1",
+  "md.comp.elevated-card.focus.state-layer.color": "onSurface",
+  "md.comp.elevated-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.elevated-card.hover.container.elevation": "md.sys.elevation.level2",
+  "md.comp.elevated-card.hover.state-layer.color": "onSurface",
+  "md.comp.elevated-card.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.elevated-card.icon.color": "primary",
+  "md.comp.elevated-card.icon.size": 24.0,
+  "md.comp.elevated-card.pressed.container.elevation": "md.sys.elevation.level1",
+  "md.comp.elevated-card.pressed.state-layer.color": "onSurface",
+  "md.comp.elevated-card.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity"
+}
diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.elevation.level0": 0.0,
   "md.sys.elevation.level1": 1.0,
diff --git a/dev/tools/gen_defaults/data/fab_extended_primary.json b/dev/tools/gen_defaults/data/fab_extended_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.extended-fab.primary.container.color": "primaryContainer",
   "md.comp.extended-fab.primary.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_large_primary.json b/dev/tools/gen_defaults/data/fab_large_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.fab.primary.large.container.color": "primaryContainer",
   "md.comp.fab.primary.large.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_primary.json b/dev/tools/gen_defaults/data/fab_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.fab.primary.container.color": "primaryContainer",
   "md.comp.fab.primary.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/fab_small_primary.json b/dev/tools/gen_defaults/data/fab_small_primary.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.fab.primary.small.container.color": "primaryContainer",
   "md.comp.fab.primary.small.container.elevation": "md.sys.elevation.level3",
diff --git a/dev/tools/gen_defaults/data/filled_card.json b/dev/tools/gen_defaults/data/filled_card.json
@@ -0,0 +1,23 @@
+{
+  "version": "v0_88",
+
+  "md.comp.filled-card.container.color": "surfaceVariant",
+  "md.comp.filled-card.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filled-card.container.shadow-color": "shadow",
+  "md.comp.filled-card.container.shape": "md.sys.shape.corner.medium",
+  "md.comp.filled-card.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.filled-card.dragged.container.elevation": "md.sys.elevation.level3",
+  "md.comp.filled-card.dragged.state-layer.color": "onSurface",
+  "md.comp.filled-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
+  "md.comp.filled-card.focus.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filled-card.focus.state-layer.color": "onSurface",
+  "md.comp.filled-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.filled-card.hover.container.elevation": "md.sys.elevation.level1",
+  "md.comp.filled-card.hover.state-layer.color": "onSurface",
+  "md.comp.filled-card.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.filled-card.icon.color": "primary",
+  "md.comp.filled-card.icon.size": 24.0,
+  "md.comp.filled-card.pressed.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filled-card.pressed.state-layer.color": "onSurface",
+  "md.comp.filled-card.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity"
+}
diff --git a/dev/tools/gen_defaults/data/filter_chip.json b/dev/tools/gen_defaults/data/filter_chip.json
@@ -1,10 +1,10 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.filter-chip.container.height": 32.0,
   "md.comp.filter-chip.container.shadow-color": "shadow",
   "md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
-  "md.comp.filter-chip.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.filter-chip.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.filter-chip.disabled.label-text.color": "onSurface",
   "md.comp.filter-chip.disabled.label-text.opacity": 0.38,
   "md.comp.filter-chip.dragged.container.elevation": "md.sys.elevation.level4",
diff --git a/dev/tools/gen_defaults/data/input_chip.json b/dev/tools/gen_defaults/data/input_chip.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
   "md.comp.input-chip.container.height": 32.0,
diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.motion.duration.100Ms": 100.0,
   "md.sys.motion.duration.1000Ms": 1000.0,
diff --git a/dev/tools/gen_defaults/data/navigation_bar.json b/dev/tools/gen_defaults/data/navigation_bar.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.navigation-bar.active.focus.icon.color": "onSecondaryContainer",
   "md.comp.navigation-bar.active.focus.label-text.color": "onSurface",
@@ -20,7 +20,7 @@
   "md.comp.navigation-bar.container.elevation": "md.sys.elevation.level2",
   "md.comp.navigation-bar.container.height": 80.0,
   "md.comp.navigation-bar.container.shape": "md.sys.shape.corner.none",
-  "md.comp.navigation-bar.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.navigation-bar.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.navigation-bar.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
   "md.comp.navigation-bar.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
   "md.comp.navigation-bar.icon.size": 24.0,
diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.navigation-rail.active.focus.icon.color": "onSecondaryContainer",
   "md.comp.navigation-rail.active.focus.label-text.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/outlined_card.json b/dev/tools/gen_defaults/data/outlined_card.json
@@ -0,0 +1,29 @@
+{
+  "version": "v0_88",
+
+  "md.comp.outlined-card.container.color": "surface",
+  "md.comp.outlined-card.container.elevation": "md.sys.elevation.level0",
+  "md.comp.outlined-card.container.shadow-color": "shadow",
+  "md.comp.outlined-card.container.shape": "md.sys.shape.corner.medium",
+  "md.comp.outlined-card.container.surface-tint-layer.color": "surfaceTint",
+  "md.comp.outlined-card.dragged.container.elevation": "md.sys.elevation.level3",
+  "md.comp.outlined-card.dragged.outline.color": "outline",
+  "md.comp.outlined-card.dragged.state-layer.color": "onSurface",
+  "md.comp.outlined-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
+  "md.comp.outlined-card.focus.container.elevation": "md.sys.elevation.level0",
+  "md.comp.outlined-card.focus.outline.color": "onSurface",
+  "md.comp.outlined-card.focus.state-layer.color": "onSurface",
+  "md.comp.outlined-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
+  "md.comp.outlined-card.hover.container.elevation": "md.sys.elevation.level1",
+  "md.comp.outlined-card.hover.outline.color": "outline",
+  "md.comp.outlined-card.hover.state-layer.color": "onSurface",
+  "md.comp.outlined-card.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
+  "md.comp.outlined-card.icon.color": "primary",
+  "md.comp.outlined-card.icon.size": 24.0,
+  "md.comp.outlined-card.outline.color": "outline",
+  "md.comp.outlined-card.outline.width": 1.0,
+  "md.comp.outlined-card.pressed.container.elevation": "md.sys.elevation.level0",
+  "md.comp.outlined-card.pressed.outline.color": "outline",
+  "md.comp.outlined-card.pressed.state-layer.color": "onSurface",
+  "md.comp.outlined-card.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity"
+}
diff --git a/dev/tools/gen_defaults/data/palette.json b/dev/tools/gen_defaults/data/palette.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.ref.palette.black": "0xFF000000",
   "md.ref.palette.error0": "0xFF000000",
diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.shape.corner.extra-large": {
     "family": "SHAPE_FAMILY_ROUNDED_CORNERS",
diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.slider.active.track.color": "primary",
   "md.comp.slider.active.track.height": 6.0,
diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.state.dragged.state-layer-opacity": 0.16,
   "md.sys.state.focus.state-layer-opacity": 0.12,
diff --git a/dev/tools/gen_defaults/data/suggestion_chip.json b/dev/tools/gen_defaults/data/suggestion_chip.json
@@ -1,9 +1,9 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.suggestion-chip.container.height": 32.0,
   "md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small",
-  "md.comp.suggestion-chip.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.suggestion-chip.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.suggestion-chip.disabled.label-text.color": "onSurface",
   "md.comp.suggestion-chip.disabled.label-text.opacity": 0.38,
   "md.comp.suggestion-chip.dragged.container.elevation": "md.sys.elevation.level4",
diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.sys.typescale.body-large.font": "md.ref.typeface.plain",
   "md.sys.typescale.body-large.line-height": 24.0,
diff --git a/dev/tools/gen_defaults/data/top_app_bar_large.json b/dev/tools/gen_defaults/data/top_app_bar_large.json
@@ -1,11 +1,11 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.top-app-bar.large.container.color": "surface",
   "md.comp.top-app-bar.large.container.elevation": "md.sys.elevation.level0",
   "md.comp.top-app-bar.large.container.height": 152.0,
   "md.comp.top-app-bar.large.container.shape": "md.sys.shape.corner.none",
-  "md.comp.top-app-bar.large.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.top-app-bar.large.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.top-app-bar.large.headline.color": "onSurface",
   "md.comp.top-app-bar.large.headline.text-style": "headlineMedium",
   "md.comp.top-app-bar.large.leading-icon.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/top_app_bar_medium.json b/dev/tools/gen_defaults/data/top_app_bar_medium.json
@@ -1,11 +1,11 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.top-app-bar.medium.container.color": "surface",
   "md.comp.top-app-bar.medium.container.elevation": "md.sys.elevation.level0",
   "md.comp.top-app-bar.medium.container.height": 112.0,
   "md.comp.top-app-bar.medium.container.shape": "md.sys.shape.corner.none",
-  "md.comp.top-app-bar.medium.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.top-app-bar.medium.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.top-app-bar.medium.headline.color": "onSurface",
   "md.comp.top-app-bar.medium.headline.text-style": "headlineSmall",
   "md.comp.top-app-bar.medium.leading-icon.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/top_app_bar_small.json b/dev/tools/gen_defaults/data/top_app_bar_small.json
@@ -1,11 +1,11 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.comp.top-app-bar.small.container.color": "surface",
   "md.comp.top-app-bar.small.container.elevation": "md.sys.elevation.level0",
   "md.comp.top-app-bar.small.container.height": 64.0,
   "md.comp.top-app-bar.small.container.shape": "md.sys.shape.corner.none",
-  "md.comp.top-app-bar.small.container.surface-tint-layer.color": "surfaceTintColor",
+  "md.comp.top-app-bar.small.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.top-app-bar.small.headline.color": "onSurface",
   "md.comp.top-app-bar.small.headline.text-style": "titleLarge",
   "md.comp.top-app-bar.small.leading-icon.color": "onSurface",
diff --git a/dev/tools/gen_defaults/data/typeface.json b/dev/tools/gen_defaults/data/typeface.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_86",
+  "version": "v0_88",
 
   "md.ref.typeface.brand": "Roboto",
   "md.ref.typeface.plain": "Roboto",
diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -773,7 +773,7 @@ class _M2Defaults extends FloatingActionButtonThemeData {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_86
+// Generated version v0_88
 class _M3Defaults extends FloatingActionButtonThemeData {
   _M3Defaults(this.context, this.type, this.hasChild)
     : _colors = Theme.of(context).colorScheme,
diff --git a/packages/flutter/lib/src/material/navigation_bar.dart b/packages/flutter/lib/src/material/navigation_bar.dart
@@ -1216,7 +1216,7 @@ class _Defaults extends NavigationBarThemeData {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_86
+// Generated version v0_88
 class _TokenDefaultsM3 extends NavigationBarThemeData {
   _TokenDefaultsM3(BuildContext context)
       : _theme = Theme.of(context),
diff --git a/packages/flutter/lib/src/material/typography.dart b/packages/flutter/lib/src/material/typography.dart
@@ -729,7 +729,7 @@ class Typography with Diagnosticable {
 // These defaults are generated from the Material Design Token
 // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
 
-// Generated version v0_86
+// Generated version v0_88
 class _M3Typography {
   _M3Typography._();
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "v0_86",`
	`2`	`+ "version": "v0_88",`
`3`	`3`
`4`	`4`	`"md.sys.elevation.level0": 0.0,`
`5`	`5`	`"md.sys.elevation.level1": 1.0,`