Introduce tone-based surfaces and accent color add-ons - Part 2 (#138…

…521) This PR is to introduce 19 new color roles and deprecate 3 color roles in `ColorScheme`. **Tone-based surface colors** (7 colors): * surfaceBright * surfaceDim * surfaceContainer * surfaceContainerLowest * surfaceContainerLow * surfaceContainerHigh * surfaceContainerHighest **Accent color add-ons** (12 colors): * primary/secondary/tertiary-Fixed * primary/secondary/tertiary-FixedDim * onPrimary/onSecondary/onTertiary-Fixed * onPrimary/onSecondary/onTertiary-FixedVariant **Deprecated colors**: * background -> replaced with surface * onBackground -> replaced with onSurface * surfaceVariant -> replaced with surfaceContainerHighest Please checkout this [design doc](https://docs.google.com/document/d/1ODqivpM_6c490T4j5XIiWCDKo5YqHy78YEFqDm4S8h4/edit?usp=sharing) for more information:) ![Screenshot 2024-01-08 at 4 56 51â�¯PM](https://github.com/flutter/flutter/assets/36861262/353cdb4c-6ba9-4435-a518-fd3f67e415f0)
engine-flutter-autoroll · Feb 20, 2024 · a2c7ed9 · a2c7ed9
1 parent eacf0f9
commit a2c7ed9
Show file tree

Hide file tree

Showing 181 changed files with 2,520 additions and 999 deletions.
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/web/material3.dart b/dev/benchmarks/macrobenchmarks/lib/src/web/material3.dart
@@ -443,7 +443,7 @@ class Cards extends StatelessWidget {
           SizedBox(
             width: cardWidth,
             child: Card(
-              color: Theme.of(context).colorScheme.surfaceVariant,
+              color: Theme.of(context).colorScheme.surfaceContainerHighest,
               elevation: 0,
               child: Container(
                 padding: const EdgeInsets.fromLTRB(10, 5, 5, 10),
@@ -1279,7 +1279,7 @@ class _IconToggleButtonState extends State<IconToggleButton> {
 ButtonStyle enabledFilledButtonStyle(bool selected, ColorScheme colors) {
   return IconButton.styleFrom(
     foregroundColor: selected ? colors.onPrimary : colors.primary,
-    backgroundColor: selected ? colors.primary : colors.surfaceVariant,
+    backgroundColor: selected ? colors.primary : colors.surfaceContainerHighest,
     disabledForegroundColor: colors.onSurface.withOpacity(0.38),
     disabledBackgroundColor: colors.onSurface.withOpacity(0.12),
     hoverColor: selected
@@ -1306,7 +1306,7 @@ ButtonStyle enabledFilledTonalButtonStyle(bool selected, ColorScheme colors) {
     foregroundColor:
         selected ? colors.onSecondaryContainer : colors.onSurfaceVariant,
     backgroundColor:
-        selected ? colors.secondaryContainer : colors.surfaceVariant,
+        selected ? colors.secondaryContainer : colors.surfaceContainerHighest,
     hoverColor: selected
         ? colors.onSecondaryContainer.withOpacity(0.08)
         : colors.onSurfaceVariant.withOpacity(0.08),
@@ -2350,7 +2350,7 @@ class ComponentGroupDecoration extends StatelessWidget {
       child: Card(
         margin: EdgeInsets.zero,
         elevation: 0,
-        color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3),
+        color: Theme.of(context).colorScheme.surfaceContainerHighest.withOpacity(0.3),
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 20.0),
           child: Center(

diff --git a/dev/integration_tests/flutter_gallery/lib/demo/calculator/home.dart b/dev/integration_tests/flutter_gallery/lib/demo/calculator/home.dart
@@ -202,7 +202,7 @@ class KeyPad extends StatelessWidget {
             ),
             Expanded(
               child: Material(
-                color: themeData.colorScheme.background,
+                color: themeData.colorScheme.surface,
                 child: Column(
                   children: <Widget>[
                     CalcKey('\u232B', calcState!.handleDelTap),

diff --git a/dev/integration_tests/flutter_gallery/lib/demo/material/chip_demo.dart b/dev/integration_tests/flutter_gallery/lib/demo/material/chip_demo.dart
@@ -203,7 +203,7 @@ class _ChipDemoState extends State<ChipDemo> {
     assert(name.length > 1);
     final int hash = name.hashCode & 0xffff;
     final double hue = (360.0 * hash / (1 << 15)) % 360.0;
-    final double themeValue = HSVColor.fromColor(theme.colorScheme.background).value;
+    final double themeValue = HSVColor.fromColor(theme.colorScheme.surface).value;
     return HSVColor.fromAHSV(1.0, hue, 0.4, themeValue).toColor();
   }
 

diff --git a/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart b/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart
@@ -114,12 +114,10 @@ const ColorScheme kShrineColorScheme = ColorScheme(
   primary: kShrinePink100,
   secondary: kShrinePink50,
   surface: kShrineSurfaceWhite,
-  background: kShrineBackgroundWhite,
   error: kShrineErrorRed,
   onPrimary: kShrineBrown900,
   onSecondary: kShrineBrown900,
   onSurface: kShrineBrown900,
-  onBackground: kShrineBrown900,
   onError: kShrineSurfaceWhite,
   brightness: Brightness.light,
 );
diff --git a/dev/integration_tests/flutter_gallery/lib/gallery/themes.dart b/dev/integration_tests/flutter_gallery/lib/gallery/themes.dart
@@ -23,7 +23,7 @@ ThemeData _buildDarkTheme() {
     secondary: secondaryColor,
     onPrimary: Colors.white,
     error: const Color(0xFFB00020),
-    background: const Color(0xFF202124),
+    surface: const Color(0xFF202124),
   );
   final ThemeData base = ThemeData(
     useMaterial3: false,

diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.badge.color": "error",
   "md.comp.badge.large.color": "error",

diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json
@@ -1,10 +1,9 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
-  "md.comp.banner.container.color": "surface",
+  "md.comp.banner.container.color": "surfaceContainerLow",
   "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": "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/bottom_app_bar.json b/dev/tools/gen_defaults/data/bottom_app_bar.json
@@ -1,9 +1,8 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
-  "md.comp.bottom-app-bar.container.color": "surface",
+  "md.comp.bottom-app-bar.container.color": "surfaceContainer",
   "md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2",
   "md.comp.bottom-app-bar.container.height": 80.0,
-  "md.comp.bottom-app-bar.container.shape": "md.sys.shape.corner.none",
-  "md.comp.bottom-app-bar.container.surface-tint-layer.color": "surfaceTint"
+  "md.comp.bottom-app-bar.container.shape": "md.sys.shape.corner.none"
 }
diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json
@@ -1,18 +1,20 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
-  "md.comp.elevated-button.container.color": "surface",
+  "md.comp.elevated-button.container.color": "surfaceContainerLow",
   "md.comp.elevated-button.container.elevation": "md.sys.elevation.level1",
   "md.comp.elevated-button.container.height": 40.0,
   "md.comp.elevated-button.container.shadow-color": "shadow",
   "md.comp.elevated-button.container.shape": "md.sys.shape.corner.full",
-  "md.comp.elevated-button.container.surface-tint-layer.color": "surfaceTint",
   "md.comp.elevated-button.disabled.container.color": "onSurface",
   "md.comp.elevated-button.disabled.container.elevation": "md.sys.elevation.level0",
   "md.comp.elevated-button.disabled.container.opacity": 0.12,
   "md.comp.elevated-button.disabled.label-text.color": "onSurface",
   "md.comp.elevated-button.disabled.label-text.opacity": 0.38,
   "md.comp.elevated-button.focus.container.elevation": "md.sys.elevation.level1",
+  "md.comp.elevated-button.focus.indicator.color": "secondary",
+  "md.comp.elevated-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.elevated-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.elevated-button.focus.label-text.color": "primary",
   "md.comp.elevated-button.focus.state-layer.color": "primary",
   "md.comp.elevated-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

diff --git a/dev/tools/gen_defaults/data/button_filled.json b/dev/tools/gen_defaults/data/button_filled.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.filled-button.container.color": "primary",
   "md.comp.filled-button.container.elevation": "md.sys.elevation.level0",
@@ -12,6 +12,9 @@
   "md.comp.filled-button.disabled.label-text.color": "onSurface",
   "md.comp.filled-button.disabled.label-text.opacity": 0.38,
   "md.comp.filled-button.focus.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filled-button.focus.indicator.color": "secondary",
+  "md.comp.filled-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.filled-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.filled-button.focus.label-text.color": "onPrimary",
   "md.comp.filled-button.focus.state-layer.color": "onPrimary",
   "md.comp.filled-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

diff --git a/dev/tools/gen_defaults/data/button_filled_tonal.json b/dev/tools/gen_defaults/data/button_filled_tonal.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.filled-tonal-button.container.color": "secondaryContainer",
   "md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0",
@@ -12,6 +12,9 @@
   "md.comp.filled-tonal-button.disabled.label-text.color": "onSurface",
   "md.comp.filled-tonal-button.disabled.label-text.opacity": 0.38,
   "md.comp.filled-tonal-button.focus.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filled-tonal-button.focus.indicator.color": "secondary",
+  "md.comp.filled-tonal-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.filled-tonal-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.filled-tonal-button.focus.label-text.color": "onSecondaryContainer",
   "md.comp.filled-tonal-button.focus.state-layer.color": "onSecondaryContainer",
   "md.comp.filled-tonal-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

diff --git a/dev/tools/gen_defaults/data/button_outlined.json b/dev/tools/gen_defaults/data/button_outlined.json
@@ -1,12 +1,15 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.outlined-button.container.height": 40.0,
   "md.comp.outlined-button.container.shape": "md.sys.shape.corner.full",
   "md.comp.outlined-button.disabled.label-text.color": "onSurface",
   "md.comp.outlined-button.disabled.label-text.opacity": 0.38,
   "md.comp.outlined-button.disabled.outline.color": "onSurface",
   "md.comp.outlined-button.disabled.outline.opacity": 0.12,
+  "md.comp.outlined-button.focus.indicator.color": "secondary",
+  "md.comp.outlined-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.outlined-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.outlined-button.focus.label-text.color": "primary",
   "md.comp.outlined-button.focus.outline.color": "primary",
   "md.comp.outlined-button.focus.state-layer.color": "primary",

diff --git a/dev/tools/gen_defaults/data/button_text.json b/dev/tools/gen_defaults/data/button_text.json
@@ -1,10 +1,13 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.text-button.container.height": 40.0,
   "md.comp.text-button.container.shape": "md.sys.shape.corner.full",
   "md.comp.text-button.disabled.label-text.color": "onSurface",
   "md.comp.text-button.disabled.label-text.opacity": 0.38,
+  "md.comp.text-button.focus.indicator.color": "secondary",
+  "md.comp.text-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.text-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.text-button.focus.label-text.color": "primary",
   "md.comp.text-button.focus.state-layer.color": "primary",
   "md.comp.text-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

diff --git a/dev/tools/gen_defaults/data/card_elevated.json b/dev/tools/gen_defaults/data/card_elevated.json
@@ -1,18 +1,20 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
-  "md.comp.elevated-card.container.color": "surface",
+  "md.comp.elevated-card.container.color": "surfaceContainerLow",
   "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.disabled.container.color": "surface",
   "md.comp.elevated-card.disabled.container.elevation": "md.sys.elevation.level1",
   "md.comp.elevated-card.disabled.container.opacity": 0.38,
   "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.indicator.color": "secondary",
+  "md.comp.elevated-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.elevated-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "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",

diff --git a/dev/tools/gen_defaults/data/card_filled.json b/dev/tools/gen_defaults/data/card_filled.json
@@ -1,7 +1,7 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
-  "md.comp.filled-card.container.color": "surfaceVariant",
+  "md.comp.filled-card.container.color": "surfaceContainerHighest",
   "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",
@@ -12,6 +12,9 @@
   "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.indicator.color": "secondary",
+  "md.comp.filled-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.filled-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "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",

diff --git a/dev/tools/gen_defaults/data/card_outlined.json b/dev/tools/gen_defaults/data/card_outlined.json
@@ -1,11 +1,10 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "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.disabled.container.elevation": "md.sys.elevation.level0",
   "md.comp.outlined-card.disabled.outline.color": "outline",
   "md.comp.outlined-card.disabled.outline.opacity": 0.12,
@@ -14,6 +13,9 @@
   "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.indicator.color": "secondary",
+  "md.comp.outlined-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.outlined-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "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",

diff --git a/dev/tools/gen_defaults/data/carousel_item.json b/dev/tools/gen_defaults/data/carousel_item.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_202",
+  "version": "v0_206",
 
   "md.comp.carousel-item.container.color": "surface",
   "md.comp.carousel-item.container.elevation": "md.sys.elevation.level0",
@@ -9,6 +9,9 @@
   "md.comp.carousel-item.disabled.container.elevation": "md.sys.elevation.level0",
   "md.comp.carousel-item.disabled.container.opacity": 0.38,
   "md.comp.carousel-item.focus.container.elevation": "md.sys.elevation.level0",
+  "md.comp.carousel-item.focus.indicator.color": "secondary",
+  "md.comp.carousel-item.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.carousel-item.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.carousel-item.focus.state-layer.color": "onSurface",
   "md.comp.carousel-item.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
   "md.comp.carousel-item.hover.container.elevation": "md.sys.elevation.level1",

diff --git a/dev/tools/gen_defaults/data/checkbox.json b/dev/tools/gen_defaults/data/checkbox.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.checkbox.container.size": 18.0,
   "md.comp.checkbox.error.focus.state-layer.color": "error",
@@ -8,6 +8,9 @@
   "md.comp.checkbox.error.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
   "md.comp.checkbox.error.pressed.state-layer.color": "error",
   "md.comp.checkbox.error.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
+  "md.comp.checkbox.focus.indicator.color": "secondary",
+  "md.comp.checkbox.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.checkbox.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.checkbox.icon.size": 18.0,
   "md.comp.checkbox.selected.container.color": "primary",
   "md.comp.checkbox.selected.disabled.container.color": "onSurface",

diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json
@@ -1,16 +1,15 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "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": "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",
   "md.comp.assist-chip.dragged.label-text.color": "onSurface",
   "md.comp.assist-chip.dragged.state-layer.color": "onSurface",
   "md.comp.assist-chip.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
-  "md.comp.assist-chip.elevated.container.color": "surface",
+  "md.comp.assist-chip.elevated.container.color": "surfaceContainerLow",
   "md.comp.assist-chip.elevated.container.elevation": "md.sys.elevation.level1",
   "md.comp.assist-chip.elevated.container.shadow-color": "shadow",
   "md.comp.assist-chip.elevated.disabled.container.color": "onSurface",
@@ -25,6 +24,9 @@
   "md.comp.assist-chip.flat.focus.outline.color": "onSurface",
   "md.comp.assist-chip.flat.outline.color": "outline",
   "md.comp.assist-chip.flat.outline.width": 1.0,
+  "md.comp.assist-chip.focus.indicator.color": "secondary",
+  "md.comp.assist-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.assist-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.assist-chip.focus.label-text.color": "onSurface",
   "md.comp.assist-chip.focus.state-layer.color": "onSurface",
   "md.comp.assist-chip.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json
@@ -1,9 +1,8 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.filter-chip.container.height": 32.0,
   "md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
-  "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",
@@ -16,7 +15,7 @@
   "md.comp.filter-chip.elevated.hover.container.elevation": "md.sys.elevation.level2",
   "md.comp.filter-chip.elevated.pressed.container.elevation": "md.sys.elevation.level1",
   "md.comp.filter-chip.elevated.selected.container.color": "secondaryContainer",
-  "md.comp.filter-chip.elevated.unselected.container.color": "surface",
+  "md.comp.filter-chip.elevated.unselected.container.color": "surfaceContainerLow",
   "md.comp.filter-chip.flat.container.elevation": "md.sys.elevation.level0",
   "md.comp.filter-chip.flat.disabled.selected.container.color": "onSurface",
   "md.comp.filter-chip.flat.disabled.selected.container.opacity": 0.12,
@@ -33,6 +32,9 @@
   "md.comp.filter-chip.flat.unselected.outline.color": "outline",
   "md.comp.filter-chip.flat.unselected.outline.width": 1.0,
   "md.comp.filter-chip.flat.unselected.pressed.container.elevation": "md.sys.elevation.level0",
+  "md.comp.filter-chip.focus.indicator.color": "secondary",
+  "md.comp.filter-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.filter-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.filter-chip.label-text.text-style": "labelLarge",
   "md.comp.filter-chip.selected.dragged.label-text.color": "onSecondaryContainer",
   "md.comp.filter-chip.selected.dragged.state-layer.color": "onSecondaryContainer",

diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0_162",
+  "version": "v0_206",
 
   "md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
   "md.comp.input-chip.container.height": 32.0,
@@ -11,6 +11,9 @@
   "md.comp.input-chip.disabled.unselected.outline.color": "onSurface",
   "md.comp.input-chip.disabled.unselected.outline.opacity": 0.12,
   "md.comp.input-chip.dragged.container.elevation": "md.sys.elevation.level4",
+  "md.comp.input-chip.focus.indicator.color": "secondary",
+  "md.comp.input-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
+  "md.comp.input-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
   "md.comp.input-chip.label-text.text-style": "labelLarge",
   "md.comp.input-chip.selected.container.color": "secondaryContainer",
   "md.comp.input-chip.selected.dragged.label-text.color": "onSecondaryContainer",