Skip to content

Commit a2c7ed9

Browse files
authored
Introduce tone-based surfaces and accent color add-ons - Part 2 (flutter#138521)
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)
1 parent eacf0f9 commit a2c7ed9

File tree

181 files changed

+2520
-999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+2520
-999
lines changed

dev/benchmarks/macrobenchmarks/lib/src/web/material3.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ class Cards extends StatelessWidget {
443443
SizedBox(
444444
width: cardWidth,
445445
child: Card(
446-
color: Theme.of(context).colorScheme.surfaceVariant,
446+
color: Theme.of(context).colorScheme.surfaceContainerHighest,
447447
elevation: 0,
448448
child: Container(
449449
padding: const EdgeInsets.fromLTRB(10, 5, 5, 10),
@@ -1279,7 +1279,7 @@ class _IconToggleButtonState extends State<IconToggleButton> {
12791279
ButtonStyle enabledFilledButtonStyle(bool selected, ColorScheme colors) {
12801280
return IconButton.styleFrom(
12811281
foregroundColor: selected ? colors.onPrimary : colors.primary,
1282-
backgroundColor: selected ? colors.primary : colors.surfaceVariant,
1282+
backgroundColor: selected ? colors.primary : colors.surfaceContainerHighest,
12831283
disabledForegroundColor: colors.onSurface.withOpacity(0.38),
12841284
disabledBackgroundColor: colors.onSurface.withOpacity(0.12),
12851285
hoverColor: selected
@@ -1306,7 +1306,7 @@ ButtonStyle enabledFilledTonalButtonStyle(bool selected, ColorScheme colors) {
13061306
foregroundColor:
13071307
selected ? colors.onSecondaryContainer : colors.onSurfaceVariant,
13081308
backgroundColor:
1309-
selected ? colors.secondaryContainer : colors.surfaceVariant,
1309+
selected ? colors.secondaryContainer : colors.surfaceContainerHighest,
13101310
hoverColor: selected
13111311
? colors.onSecondaryContainer.withOpacity(0.08)
13121312
: colors.onSurfaceVariant.withOpacity(0.08),
@@ -2350,7 +2350,7 @@ class ComponentGroupDecoration extends StatelessWidget {
23502350
child: Card(
23512351
margin: EdgeInsets.zero,
23522352
elevation: 0,
2353-
color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3),
2353+
color: Theme.of(context).colorScheme.surfaceContainerHighest.withOpacity(0.3),
23542354
child: Padding(
23552355
padding: const EdgeInsets.symmetric(vertical: 20.0),
23562356
child: Center(

dev/integration_tests/flutter_gallery/lib/demo/calculator/home.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class KeyPad extends StatelessWidget {
202202
),
203203
Expanded(
204204
child: Material(
205-
color: themeData.colorScheme.background,
205+
color: themeData.colorScheme.surface,
206206
child: Column(
207207
children: <Widget>[
208208
CalcKey('\u232B', calcState!.handleDelTap),

dev/integration_tests/flutter_gallery/lib/demo/material/chip_demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class _ChipDemoState extends State<ChipDemo> {
203203
assert(name.length > 1);
204204
final int hash = name.hashCode & 0xffff;
205205
final double hue = (360.0 * hash / (1 << 15)) % 360.0;
206-
final double themeValue = HSVColor.fromColor(theme.colorScheme.background).value;
206+
final double themeValue = HSVColor.fromColor(theme.colorScheme.surface).value;
207207
return HSVColor.fromAHSV(1.0, hue, 0.4, themeValue).toColor();
208208
}
209209

dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,10 @@ const ColorScheme kShrineColorScheme = ColorScheme(
114114
primary: kShrinePink100,
115115
secondary: kShrinePink50,
116116
surface: kShrineSurfaceWhite,
117-
background: kShrineBackgroundWhite,
118117
error: kShrineErrorRed,
119118
onPrimary: kShrineBrown900,
120119
onSecondary: kShrineBrown900,
121120
onSurface: kShrineBrown900,
122-
onBackground: kShrineBrown900,
123121
onError: kShrineSurfaceWhite,
124122
brightness: Brightness.light,
125123
);

dev/integration_tests/flutter_gallery/lib/gallery/themes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ThemeData _buildDarkTheme() {
2323
secondary: secondaryColor,
2424
onPrimary: Colors.white,
2525
error: const Color(0xFFB00020),
26-
background: const Color(0xFF202124),
26+
surface: const Color(0xFF202124),
2727
);
2828
final ThemeData base = ThemeData(
2929
useMaterial3: false,

dev/tools/gen_defaults/data/badge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.badge.color": "error",
55
"md.comp.badge.large.color": "error",

dev/tools/gen_defaults/data/banner.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

4-
"md.comp.banner.container.color": "surface",
4+
"md.comp.banner.container.color": "surfaceContainerLow",
55
"md.comp.banner.container.elevation": "md.sys.elevation.level1",
66
"md.comp.banner.container.shape": "md.sys.shape.corner.none",
7-
"md.comp.banner.container.surface-tint-layer.color": "surfaceTint",
87
"md.comp.banner.desktop.with-single-line.container.height": 52.0,
98
"md.comp.banner.desktop.with-three-lines.container.height": 90.0,
109
"md.comp.banner.desktop.with-two-lines.with-image.container.height": 72.0,
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

4-
"md.comp.bottom-app-bar.container.color": "surface",
4+
"md.comp.bottom-app-bar.container.color": "surfaceContainer",
55
"md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2",
66
"md.comp.bottom-app-bar.container.height": 80.0,
7-
"md.comp.bottom-app-bar.container.shape": "md.sys.shape.corner.none",
8-
"md.comp.bottom-app-bar.container.surface-tint-layer.color": "surfaceTint"
7+
"md.comp.bottom-app-bar.container.shape": "md.sys.shape.corner.none"
98
}

dev/tools/gen_defaults/data/button_elevated.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

4-
"md.comp.elevated-button.container.color": "surface",
4+
"md.comp.elevated-button.container.color": "surfaceContainerLow",
55
"md.comp.elevated-button.container.elevation": "md.sys.elevation.level1",
66
"md.comp.elevated-button.container.height": 40.0,
77
"md.comp.elevated-button.container.shadow-color": "shadow",
88
"md.comp.elevated-button.container.shape": "md.sys.shape.corner.full",
9-
"md.comp.elevated-button.container.surface-tint-layer.color": "surfaceTint",
109
"md.comp.elevated-button.disabled.container.color": "onSurface",
1110
"md.comp.elevated-button.disabled.container.elevation": "md.sys.elevation.level0",
1211
"md.comp.elevated-button.disabled.container.opacity": 0.12,
1312
"md.comp.elevated-button.disabled.label-text.color": "onSurface",
1413
"md.comp.elevated-button.disabled.label-text.opacity": 0.38,
1514
"md.comp.elevated-button.focus.container.elevation": "md.sys.elevation.level1",
15+
"md.comp.elevated-button.focus.indicator.color": "secondary",
16+
"md.comp.elevated-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
17+
"md.comp.elevated-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1618
"md.comp.elevated-button.focus.label-text.color": "primary",
1719
"md.comp.elevated-button.focus.state-layer.color": "primary",
1820
"md.comp.elevated-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/button_filled.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.filled-button.container.color": "primary",
55
"md.comp.filled-button.container.elevation": "md.sys.elevation.level0",
@@ -12,6 +12,9 @@
1212
"md.comp.filled-button.disabled.label-text.color": "onSurface",
1313
"md.comp.filled-button.disabled.label-text.opacity": 0.38,
1414
"md.comp.filled-button.focus.container.elevation": "md.sys.elevation.level0",
15+
"md.comp.filled-button.focus.indicator.color": "secondary",
16+
"md.comp.filled-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
17+
"md.comp.filled-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1518
"md.comp.filled-button.focus.label-text.color": "onPrimary",
1619
"md.comp.filled-button.focus.state-layer.color": "onPrimary",
1720
"md.comp.filled-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/button_filled_tonal.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.filled-tonal-button.container.color": "secondaryContainer",
55
"md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0",
@@ -12,6 +12,9 @@
1212
"md.comp.filled-tonal-button.disabled.label-text.color": "onSurface",
1313
"md.comp.filled-tonal-button.disabled.label-text.opacity": 0.38,
1414
"md.comp.filled-tonal-button.focus.container.elevation": "md.sys.elevation.level0",
15+
"md.comp.filled-tonal-button.focus.indicator.color": "secondary",
16+
"md.comp.filled-tonal-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
17+
"md.comp.filled-tonal-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1518
"md.comp.filled-tonal-button.focus.label-text.color": "onSecondaryContainer",
1619
"md.comp.filled-tonal-button.focus.state-layer.color": "onSecondaryContainer",
1720
"md.comp.filled-tonal-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/button_outlined.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.outlined-button.container.height": 40.0,
55
"md.comp.outlined-button.container.shape": "md.sys.shape.corner.full",
66
"md.comp.outlined-button.disabled.label-text.color": "onSurface",
77
"md.comp.outlined-button.disabled.label-text.opacity": 0.38,
88
"md.comp.outlined-button.disabled.outline.color": "onSurface",
99
"md.comp.outlined-button.disabled.outline.opacity": 0.12,
10+
"md.comp.outlined-button.focus.indicator.color": "secondary",
11+
"md.comp.outlined-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
12+
"md.comp.outlined-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1013
"md.comp.outlined-button.focus.label-text.color": "primary",
1114
"md.comp.outlined-button.focus.outline.color": "primary",
1215
"md.comp.outlined-button.focus.state-layer.color": "primary",

dev/tools/gen_defaults/data/button_text.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.text-button.container.height": 40.0,
55
"md.comp.text-button.container.shape": "md.sys.shape.corner.full",
66
"md.comp.text-button.disabled.label-text.color": "onSurface",
77
"md.comp.text-button.disabled.label-text.opacity": 0.38,
8+
"md.comp.text-button.focus.indicator.color": "secondary",
9+
"md.comp.text-button.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
10+
"md.comp.text-button.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
811
"md.comp.text-button.focus.label-text.color": "primary",
912
"md.comp.text-button.focus.state-layer.color": "primary",
1013
"md.comp.text-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/card_elevated.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

4-
"md.comp.elevated-card.container.color": "surface",
4+
"md.comp.elevated-card.container.color": "surfaceContainerLow",
55
"md.comp.elevated-card.container.elevation": "md.sys.elevation.level1",
66
"md.comp.elevated-card.container.shadow-color": "shadow",
77
"md.comp.elevated-card.container.shape": "md.sys.shape.corner.medium",
8-
"md.comp.elevated-card.container.surface-tint-layer.color": "surfaceTint",
98
"md.comp.elevated-card.disabled.container.color": "surface",
109
"md.comp.elevated-card.disabled.container.elevation": "md.sys.elevation.level1",
1110
"md.comp.elevated-card.disabled.container.opacity": 0.38,
1211
"md.comp.elevated-card.dragged.container.elevation": "md.sys.elevation.level4",
1312
"md.comp.elevated-card.dragged.state-layer.color": "onSurface",
1413
"md.comp.elevated-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
1514
"md.comp.elevated-card.focus.container.elevation": "md.sys.elevation.level1",
15+
"md.comp.elevated-card.focus.indicator.color": "secondary",
16+
"md.comp.elevated-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
17+
"md.comp.elevated-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1618
"md.comp.elevated-card.focus.state-layer.color": "onSurface",
1719
"md.comp.elevated-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
1820
"md.comp.elevated-card.hover.container.elevation": "md.sys.elevation.level2",

dev/tools/gen_defaults/data/card_filled.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

4-
"md.comp.filled-card.container.color": "surfaceVariant",
4+
"md.comp.filled-card.container.color": "surfaceContainerHighest",
55
"md.comp.filled-card.container.elevation": "md.sys.elevation.level0",
66
"md.comp.filled-card.container.shadow-color": "shadow",
77
"md.comp.filled-card.container.shape": "md.sys.shape.corner.medium",
@@ -12,6 +12,9 @@
1212
"md.comp.filled-card.dragged.state-layer.color": "onSurface",
1313
"md.comp.filled-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
1414
"md.comp.filled-card.focus.container.elevation": "md.sys.elevation.level0",
15+
"md.comp.filled-card.focus.indicator.color": "secondary",
16+
"md.comp.filled-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
17+
"md.comp.filled-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1518
"md.comp.filled-card.focus.state-layer.color": "onSurface",
1619
"md.comp.filled-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
1720
"md.comp.filled-card.hover.container.elevation": "md.sys.elevation.level1",

dev/tools/gen_defaults/data/card_outlined.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.outlined-card.container.color": "surface",
55
"md.comp.outlined-card.container.elevation": "md.sys.elevation.level0",
66
"md.comp.outlined-card.container.shadow-color": "shadow",
77
"md.comp.outlined-card.container.shape": "md.sys.shape.corner.medium",
8-
"md.comp.outlined-card.container.surface-tint-layer.color": "surfaceTint",
98
"md.comp.outlined-card.disabled.container.elevation": "md.sys.elevation.level0",
109
"md.comp.outlined-card.disabled.outline.color": "outline",
1110
"md.comp.outlined-card.disabled.outline.opacity": 0.12,
@@ -14,6 +13,9 @@
1413
"md.comp.outlined-card.dragged.state-layer.color": "onSurface",
1514
"md.comp.outlined-card.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
1615
"md.comp.outlined-card.focus.container.elevation": "md.sys.elevation.level0",
16+
"md.comp.outlined-card.focus.indicator.color": "secondary",
17+
"md.comp.outlined-card.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
18+
"md.comp.outlined-card.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1719
"md.comp.outlined-card.focus.outline.color": "onSurface",
1820
"md.comp.outlined-card.focus.state-layer.color": "onSurface",
1921
"md.comp.outlined-card.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/carousel_item.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_202",
2+
"version": "v0_206",
33

44
"md.comp.carousel-item.container.color": "surface",
55
"md.comp.carousel-item.container.elevation": "md.sys.elevation.level0",
@@ -9,6 +9,9 @@
99
"md.comp.carousel-item.disabled.container.elevation": "md.sys.elevation.level0",
1010
"md.comp.carousel-item.disabled.container.opacity": 0.38,
1111
"md.comp.carousel-item.focus.container.elevation": "md.sys.elevation.level0",
12+
"md.comp.carousel-item.focus.indicator.color": "secondary",
13+
"md.comp.carousel-item.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
14+
"md.comp.carousel-item.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1215
"md.comp.carousel-item.focus.state-layer.color": "onSurface",
1316
"md.comp.carousel-item.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
1417
"md.comp.carousel-item.hover.container.elevation": "md.sys.elevation.level1",

dev/tools/gen_defaults/data/checkbox.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.checkbox.container.size": 18.0,
55
"md.comp.checkbox.error.focus.state-layer.color": "error",
@@ -8,6 +8,9 @@
88
"md.comp.checkbox.error.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
99
"md.comp.checkbox.error.pressed.state-layer.color": "error",
1010
"md.comp.checkbox.error.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
11+
"md.comp.checkbox.focus.indicator.color": "secondary",
12+
"md.comp.checkbox.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
13+
"md.comp.checkbox.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1114
"md.comp.checkbox.icon.size": 18.0,
1215
"md.comp.checkbox.selected.container.color": "primary",
1316
"md.comp.checkbox.selected.disabled.container.color": "onSurface",

dev/tools/gen_defaults/data/chip_assist.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.assist-chip.container.height": 32.0,
55
"md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",
6-
"md.comp.assist-chip.container.surface-tint-layer.color": "surfaceTint",
76
"md.comp.assist-chip.disabled.label-text.color": "onSurface",
87
"md.comp.assist-chip.disabled.label-text.opacity": 0.38,
98
"md.comp.assist-chip.dragged.container.elevation": "md.sys.elevation.level4",
109
"md.comp.assist-chip.dragged.label-text.color": "onSurface",
1110
"md.comp.assist-chip.dragged.state-layer.color": "onSurface",
1211
"md.comp.assist-chip.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
13-
"md.comp.assist-chip.elevated.container.color": "surface",
12+
"md.comp.assist-chip.elevated.container.color": "surfaceContainerLow",
1413
"md.comp.assist-chip.elevated.container.elevation": "md.sys.elevation.level1",
1514
"md.comp.assist-chip.elevated.container.shadow-color": "shadow",
1615
"md.comp.assist-chip.elevated.disabled.container.color": "onSurface",
@@ -25,6 +24,9 @@
2524
"md.comp.assist-chip.flat.focus.outline.color": "onSurface",
2625
"md.comp.assist-chip.flat.outline.color": "outline",
2726
"md.comp.assist-chip.flat.outline.width": 1.0,
27+
"md.comp.assist-chip.focus.indicator.color": "secondary",
28+
"md.comp.assist-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
29+
"md.comp.assist-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
2830
"md.comp.assist-chip.focus.label-text.color": "onSurface",
2931
"md.comp.assist-chip.focus.state-layer.color": "onSurface",
3032
"md.comp.assist-chip.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

dev/tools/gen_defaults/data/chip_filter.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.filter-chip.container.height": 32.0,
55
"md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
6-
"md.comp.filter-chip.container.surface-tint-layer.color": "surfaceTint",
76
"md.comp.filter-chip.disabled.label-text.color": "onSurface",
87
"md.comp.filter-chip.disabled.label-text.opacity": 0.38,
98
"md.comp.filter-chip.dragged.container.elevation": "md.sys.elevation.level4",
@@ -16,7 +15,7 @@
1615
"md.comp.filter-chip.elevated.hover.container.elevation": "md.sys.elevation.level2",
1716
"md.comp.filter-chip.elevated.pressed.container.elevation": "md.sys.elevation.level1",
1817
"md.comp.filter-chip.elevated.selected.container.color": "secondaryContainer",
19-
"md.comp.filter-chip.elevated.unselected.container.color": "surface",
18+
"md.comp.filter-chip.elevated.unselected.container.color": "surfaceContainerLow",
2019
"md.comp.filter-chip.flat.container.elevation": "md.sys.elevation.level0",
2120
"md.comp.filter-chip.flat.disabled.selected.container.color": "onSurface",
2221
"md.comp.filter-chip.flat.disabled.selected.container.opacity": 0.12,
@@ -33,6 +32,9 @@
3332
"md.comp.filter-chip.flat.unselected.outline.color": "outline",
3433
"md.comp.filter-chip.flat.unselected.outline.width": 1.0,
3534
"md.comp.filter-chip.flat.unselected.pressed.container.elevation": "md.sys.elevation.level0",
35+
"md.comp.filter-chip.focus.indicator.color": "secondary",
36+
"md.comp.filter-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
37+
"md.comp.filter-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
3638
"md.comp.filter-chip.label-text.text-style": "labelLarge",
3739
"md.comp.filter-chip.selected.dragged.label-text.color": "onSecondaryContainer",
3840
"md.comp.filter-chip.selected.dragged.state-layer.color": "onSecondaryContainer",

dev/tools/gen_defaults/data/chip_input.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "v0_162",
2+
"version": "v0_206",
33

44
"md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
55
"md.comp.input-chip.container.height": 32.0,
@@ -11,6 +11,9 @@
1111
"md.comp.input-chip.disabled.unselected.outline.color": "onSurface",
1212
"md.comp.input-chip.disabled.unselected.outline.opacity": 0.12,
1313
"md.comp.input-chip.dragged.container.elevation": "md.sys.elevation.level4",
14+
"md.comp.input-chip.focus.indicator.color": "secondary",
15+
"md.comp.input-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",
16+
"md.comp.input-chip.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
1417
"md.comp.input-chip.label-text.text-style": "labelLarge",
1518
"md.comp.input-chip.selected.container.color": "secondaryContainer",
1619
"md.comp.input-chip.selected.dragged.label-text.color": "onSecondaryContainer",

0 commit comments

Comments
 (0)