From 0f827d7450aac16db1f61b280a17de10c8aac192 Mon Sep 17 00:00:00 2001 From: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:39:58 -0700 Subject: [PATCH] Update Material token to the latest 4.1.0 (#150382) This PR is to update material tokens to the latest version 4.1.0, which: * deprecates two tokens in `Slider` * doesn't impact the material widgets' defaults --- dev/tools/gen_defaults/data/badge.json | 2 +- dev/tools/gen_defaults/data/banner.json | 2 +- dev/tools/gen_defaults/data/bottom_app_bar.json | 2 +- dev/tools/gen_defaults/data/button_elevated.json | 2 +- dev/tools/gen_defaults/data/button_filled.json | 2 +- dev/tools/gen_defaults/data/button_filled_tonal.json | 2 +- dev/tools/gen_defaults/data/button_outlined.json | 2 +- dev/tools/gen_defaults/data/button_text.json | 2 +- dev/tools/gen_defaults/data/card_elevated.json | 2 +- dev/tools/gen_defaults/data/card_filled.json | 2 +- dev/tools/gen_defaults/data/card_outlined.json | 2 +- dev/tools/gen_defaults/data/carousel_item.json | 2 +- dev/tools/gen_defaults/data/checkbox.json | 2 +- dev/tools/gen_defaults/data/chip_assist.json | 2 +- dev/tools/gen_defaults/data/chip_filter.json | 2 +- dev/tools/gen_defaults/data/chip_input.json | 2 +- dev/tools/gen_defaults/data/chip_suggestion.json | 2 +- dev/tools/gen_defaults/data/color_dark.json | 2 +- dev/tools/gen_defaults/data/color_light.json | 2 +- dev/tools/gen_defaults/data/date_picker_docked.json | 2 +- dev/tools/gen_defaults/data/date_picker_input_modal.json | 2 +- dev/tools/gen_defaults/data/date_picker_modal.json | 2 +- dev/tools/gen_defaults/data/dialog.json | 2 +- dev/tools/gen_defaults/data/dialog_fullscreen.json | 2 +- dev/tools/gen_defaults/data/divider.json | 2 +- dev/tools/gen_defaults/data/elevation.json | 2 +- dev/tools/gen_defaults/data/fab_extended_primary.json | 2 +- dev/tools/gen_defaults/data/fab_large_primary.json | 2 +- dev/tools/gen_defaults/data/fab_primary.json | 2 +- dev/tools/gen_defaults/data/fab_small_primary.json | 2 +- dev/tools/gen_defaults/data/icon_button.json | 2 +- dev/tools/gen_defaults/data/icon_button_filled.json | 2 +- dev/tools/gen_defaults/data/icon_button_filled_tonal.json | 2 +- dev/tools/gen_defaults/data/icon_button_outlined.json | 2 +- dev/tools/gen_defaults/data/list.json | 2 +- dev/tools/gen_defaults/data/menu.json | 2 +- dev/tools/gen_defaults/data/motion.json | 2 +- dev/tools/gen_defaults/data/navigation_bar.json | 2 +- dev/tools/gen_defaults/data/navigation_drawer.json | 2 +- dev/tools/gen_defaults/data/navigation_rail.json | 2 +- dev/tools/gen_defaults/data/navigation_tab_primary.json | 2 +- dev/tools/gen_defaults/data/navigation_tab_secondary.json | 2 +- dev/tools/gen_defaults/data/palette.json | 2 +- dev/tools/gen_defaults/data/progress_indicator.json | 2 +- dev/tools/gen_defaults/data/radio_button.json | 2 +- dev/tools/gen_defaults/data/search_bar.json | 2 +- dev/tools/gen_defaults/data/search_view.json | 2 +- dev/tools/gen_defaults/data/segmented_button_outlined.json | 2 +- dev/tools/gen_defaults/data/shape.json | 2 +- dev/tools/gen_defaults/data/sheet_bottom.json | 2 +- dev/tools/gen_defaults/data/slider.json | 4 +--- dev/tools/gen_defaults/data/snackbar.json | 2 +- dev/tools/gen_defaults/data/state.json | 2 +- dev/tools/gen_defaults/data/switch.json | 2 +- dev/tools/gen_defaults/data/text_field_filled.json | 2 +- dev/tools/gen_defaults/data/text_field_outlined.json | 2 +- dev/tools/gen_defaults/data/text_style.json | 2 +- dev/tools/gen_defaults/data/time_picker.json | 2 +- dev/tools/gen_defaults/data/top_app_bar_large.json | 2 +- dev/tools/gen_defaults/data/top_app_bar_medium.json | 2 +- dev/tools/gen_defaults/data/top_app_bar_small.json | 2 +- dev/tools/gen_defaults/data/typeface.json | 2 +- dev/tools/gen_defaults/generated/used_tokens.csv | 2 +- 63 files changed, 63 insertions(+), 65 deletions(-) diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json index f081c8bf7f..b1adcbd6be 100644 --- a/dev/tools/gen_defaults/data/badge.json +++ b/dev/tools/gen_defaults/data/badge.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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 index 5031b0306c..844fae132e 100644 --- a/dev/tools/gen_defaults/data/banner.json +++ b/dev/tools/gen_defaults/data/banner.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.banner.container.color": "surfaceContainerLow", "md.comp.banner.container.elevation": "md.sys.elevation.level1", diff --git a/dev/tools/gen_defaults/data/bottom_app_bar.json b/dev/tools/gen_defaults/data/bottom_app_bar.json index 474e12b7e6..3af189db8a 100644 --- a/dev/tools/gen_defaults/data/bottom_app_bar.json +++ b/dev/tools/gen_defaults/data/bottom_app_bar.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.bottom-app-bar.container.color": "surfaceContainer", "md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2", diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json index 4b872c6fc3..77ca5e6a9a 100644 --- a/dev/tools/gen_defaults/data/button_elevated.json +++ b/dev/tools/gen_defaults/data/button_elevated.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.elevated-button.container.color": "surfaceContainerLow", "md.comp.elevated-button.container.elevation": "md.sys.elevation.level1", diff --git a/dev/tools/gen_defaults/data/button_filled.json b/dev/tools/gen_defaults/data/button_filled.json index 3f15c8a429..9ae7c71a20 100644 --- a/dev/tools/gen_defaults/data/button_filled.json +++ b/dev/tools/gen_defaults/data/button_filled.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filled-button.container.color": "primary", "md.comp.filled-button.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/button_filled_tonal.json b/dev/tools/gen_defaults/data/button_filled_tonal.json index 020bf1def4..4cf706487f 100644 --- 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": "4_0_0", + "version": "v4_1_0", "md.comp.filled-tonal-button.container.color": "secondaryContainer", "md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/button_outlined.json b/dev/tools/gen_defaults/data/button_outlined.json index 1703b06967..40098f533c 100644 --- a/dev/tools/gen_defaults/data/button_outlined.json +++ b/dev/tools/gen_defaults/data/button_outlined.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.outlined-button.container.height": 40.0, "md.comp.outlined-button.container.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/button_text.json b/dev/tools/gen_defaults/data/button_text.json index 56144a6dba..11ae40b69d 100644 --- a/dev/tools/gen_defaults/data/button_text.json +++ b/dev/tools/gen_defaults/data/button_text.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.text-button.container.height": 40.0, "md.comp.text-button.container.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/card_elevated.json b/dev/tools/gen_defaults/data/card_elevated.json index 567d654583..a694e4b778 100644 --- a/dev/tools/gen_defaults/data/card_elevated.json +++ b/dev/tools/gen_defaults/data/card_elevated.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.elevated-card.container.color": "surfaceContainerLow", "md.comp.elevated-card.container.elevation": "md.sys.elevation.level1", diff --git a/dev/tools/gen_defaults/data/card_filled.json b/dev/tools/gen_defaults/data/card_filled.json index 413c055875..5001db589c 100644 --- a/dev/tools/gen_defaults/data/card_filled.json +++ b/dev/tools/gen_defaults/data/card_filled.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filled-card.container.color": "surfaceContainerHighest", "md.comp.filled-card.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/card_outlined.json b/dev/tools/gen_defaults/data/card_outlined.json index 5ab477be41..64aa816939 100644 --- a/dev/tools/gen_defaults/data/card_outlined.json +++ b/dev/tools/gen_defaults/data/card_outlined.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.outlined-card.container.color": "surface", "md.comp.outlined-card.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/carousel_item.json b/dev/tools/gen_defaults/data/carousel_item.json index db515a8e85..07879d7216 100644 --- a/dev/tools/gen_defaults/data/carousel_item.json +++ b/dev/tools/gen_defaults/data/carousel_item.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.carousel-item.container.color": "surface", "md.comp.carousel-item.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/checkbox.json b/dev/tools/gen_defaults/data/checkbox.json index 558d6d650a..3b6604fe78 100644 --- a/dev/tools/gen_defaults/data/checkbox.json +++ b/dev/tools/gen_defaults/data/checkbox.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.checkbox.container.size": 18.0, "md.comp.checkbox.error.focus.state-layer.color": "error", diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json index 860b2062ba..d13c9f11d1 100644 --- a/dev/tools/gen_defaults/data/chip_assist.json +++ b/dev/tools/gen_defaults/data/chip_assist.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.assist-chip.container.height": 32.0, "md.comp.assist-chip.container.shape": "md.sys.shape.corner.small", diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json index c18baccee7..ea18d11b77 100644 --- a/dev/tools/gen_defaults/data/chip_filter.json +++ b/dev/tools/gen_defaults/data/chip_filter.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filter-chip.container.height": 32.0, "md.comp.filter-chip.container.shape": "md.sys.shape.corner.small", diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json index 6cbfb54538..918873cdf7 100644 --- a/dev/tools/gen_defaults/data/chip_input.json +++ b/dev/tools/gen_defaults/data/chip_input.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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/chip_suggestion.json b/dev/tools/gen_defaults/data/chip_suggestion.json index c9753fcba5..7826ee67a7 100644 --- a/dev/tools/gen_defaults/data/chip_suggestion.json +++ b/dev/tools/gen_defaults/data/chip_suggestion.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.suggestion-chip.container.height": 32.0, "md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small", diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json index 397c003860..613f7b37e4 100644 --- a/dev/tools/gen_defaults/data/color_dark.json +++ b/dev/tools/gen_defaults/data/color_dark.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.sys.color.background": "md.ref.palette.neutral6", "md.sys.color.error": "md.ref.palette.error80", diff --git a/dev/tools/gen_defaults/data/color_light.json b/dev/tools/gen_defaults/data/color_light.json index f64a69a872..6ce96ef112 100644 --- a/dev/tools/gen_defaults/data/color_light.json +++ b/dev/tools/gen_defaults/data/color_light.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.sys.color.background": "md.ref.palette.neutral98", "md.sys.color.error": "md.ref.palette.error40", diff --git a/dev/tools/gen_defaults/data/date_picker_docked.json b/dev/tools/gen_defaults/data/date_picker_docked.json index 8b88f21cf7..6364b44f98 100644 --- a/dev/tools/gen_defaults/data/date_picker_docked.json +++ b/dev/tools/gen_defaults/data/date_picker_docked.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.date-picker.docked.container.color": "surfaceContainerHigh", "md.comp.date-picker.docked.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/date_picker_input_modal.json b/dev/tools/gen_defaults/data/date_picker_input_modal.json index 0859932e43..62e03838da 100644 --- a/dev/tools/gen_defaults/data/date_picker_input_modal.json +++ b/dev/tools/gen_defaults/data/date_picker_input_modal.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.date-input.modal.container.color": "surfaceContainerHigh", "md.comp.date-input.modal.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/date_picker_modal.json b/dev/tools/gen_defaults/data/date_picker_modal.json index 88336deb7a..d813c70b35 100644 --- a/dev/tools/gen_defaults/data/date_picker_modal.json +++ b/dev/tools/gen_defaults/data/date_picker_modal.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.date-picker.modal.container.color": "surfaceContainerHigh", "md.comp.date-picker.modal.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json index 8a1169536d..556c0fbeba 100644 --- a/dev/tools/gen_defaults/data/dialog.json +++ b/dev/tools/gen_defaults/data/dialog.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.dialog.action.focus.label-text.color": "primary", "md.comp.dialog.action.focus.state-layer.color": "primary", diff --git a/dev/tools/gen_defaults/data/dialog_fullscreen.json b/dev/tools/gen_defaults/data/dialog_fullscreen.json index d6d142eba1..048c67cca6 100644 --- a/dev/tools/gen_defaults/data/dialog_fullscreen.json +++ b/dev/tools/gen_defaults/data/dialog_fullscreen.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.full-screen-dialog.container.color": "surface", "md.comp.full-screen-dialog.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/divider.json b/dev/tools/gen_defaults/data/divider.json index 1a0e48202d..22b6ea39c8 100644 --- a/dev/tools/gen_defaults/data/divider.json +++ b/dev/tools/gen_defaults/data/divider.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.divider.color": "outlineVariant", "md.comp.divider.thickness": 1.0 diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json index ccea559513..f4539fb649 100644 --- a/dev/tools/gen_defaults/data/elevation.json +++ b/dev/tools/gen_defaults/data/elevation.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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 index a0747b1556..c2a7bd9d4b 100644 --- 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": "4_0_0", + "version": "v4_1_0", "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 index 632dedf260..209bf1a7e1 100644 --- 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": "4_0_0", + "version": "v4_1_0", "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 index 23064b8326..122be08f78 100644 --- a/dev/tools/gen_defaults/data/fab_primary.json +++ b/dev/tools/gen_defaults/data/fab_primary.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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 index 4496ce8699..5e960cd2c3 100644 --- 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": "4_0_0", + "version": "v4_1_0", "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/icon_button.json b/dev/tools/gen_defaults/data/icon_button.json index 669b13928b..f7113f922c 100644 --- a/dev/tools/gen_defaults/data/icon_button.json +++ b/dev/tools/gen_defaults/data/icon_button.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.icon-button.disabled.icon.color": "onSurface", "md.comp.icon-button.disabled.icon.opacity": 0.38, diff --git a/dev/tools/gen_defaults/data/icon_button_filled.json b/dev/tools/gen_defaults/data/icon_button_filled.json index c834276b66..6e8cba5c2e 100644 --- a/dev/tools/gen_defaults/data/icon_button_filled.json +++ b/dev/tools/gen_defaults/data/icon_button_filled.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filled-icon-button.container.color": "primary", "md.comp.filled-icon-button.container.height": 40.0, diff --git a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json index dab92e6cb0..ce16420609 100644 --- a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json +++ b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filled-tonal-icon-button.container.color": "secondaryContainer", "md.comp.filled-tonal-icon-button.container.height": 40.0, diff --git a/dev/tools/gen_defaults/data/icon_button_outlined.json b/dev/tools/gen_defaults/data/icon_button_outlined.json index 8f2f48fe4d..200449702e 100644 --- a/dev/tools/gen_defaults/data/icon_button_outlined.json +++ b/dev/tools/gen_defaults/data/icon_button_outlined.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.outlined-icon-button.container.height": 40.0, "md.comp.outlined-icon-button.container.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/list.json b/dev/tools/gen_defaults/data/list.json index 3a55a10997..acbd599fd2 100644 --- a/dev/tools/gen_defaults/data/list.json +++ b/dev/tools/gen_defaults/data/list.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.list.divider.leading-space": 16.0, "md.comp.list.divider.trailing-space": 16.0, diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json index 455d94e08c..fd3c50572d 100644 --- a/dev/tools/gen_defaults/data/menu.json +++ b/dev/tools/gen_defaults/data/menu.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.menu.container.color": "surfaceContainer", "md.comp.menu.container.elevation": "md.sys.elevation.level2", diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json index acd5aca1a6..1ea861226b 100644 --- a/dev/tools/gen_defaults/data/motion.json +++ b/dev/tools/gen_defaults/data/motion.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.sys.motion.duration.extra-long1Ms": 700.0, "md.sys.motion.duration.extra-long2Ms": 800.0, diff --git a/dev/tools/gen_defaults/data/navigation_bar.json b/dev/tools/gen_defaults/data/navigation_bar.json index 335fa763d4..4b017bab2a 100644 --- a/dev/tools/gen_defaults/data/navigation_bar.json +++ b/dev/tools/gen_defaults/data/navigation_bar.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.navigation-bar.active.focus.icon.color": "onSecondaryContainer", "md.comp.navigation-bar.active.focus.label-text.color": "onSurface", diff --git a/dev/tools/gen_defaults/data/navigation_drawer.json b/dev/tools/gen_defaults/data/navigation_drawer.json index bdac0e0194..f0a7e9fed9 100644 --- a/dev/tools/gen_defaults/data/navigation_drawer.json +++ b/dev/tools/gen_defaults/data/navigation_drawer.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.navigation-drawer.active.focus.icon.color": "onSecondaryContainer", "md.comp.navigation-drawer.active.focus.label-text.color": "onSecondaryContainer", diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json index b4d79b964c..4804d6e55a 100644 --- a/dev/tools/gen_defaults/data/navigation_rail.json +++ b/dev/tools/gen_defaults/data/navigation_rail.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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/navigation_tab_primary.json b/dev/tools/gen_defaults/data/navigation_tab_primary.json index 11b5550c89..2126e5e49c 100644 --- a/dev/tools/gen_defaults/data/navigation_tab_primary.json +++ b/dev/tools/gen_defaults/data/navigation_tab_primary.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.primary-navigation-tab.active.focus.state-layer.color": "primary", "md.comp.primary-navigation-tab.active.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", diff --git a/dev/tools/gen_defaults/data/navigation_tab_secondary.json b/dev/tools/gen_defaults/data/navigation_tab_secondary.json index 239058b698..31263bd583 100644 --- a/dev/tools/gen_defaults/data/navigation_tab_secondary.json +++ b/dev/tools/gen_defaults/data/navigation_tab_secondary.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.secondary-navigation-tab.active-indicator.color": "primary", "md.comp.secondary-navigation-tab.active-indicator.height": 2.0, diff --git a/dev/tools/gen_defaults/data/palette.json b/dev/tools/gen_defaults/data/palette.json index d415c0d694..57880cacfe 100644 --- a/dev/tools/gen_defaults/data/palette.json +++ b/dev/tools/gen_defaults/data/palette.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.ref.palette.black": "0xFF000000", "md.ref.palette.blue0": "0xFF000000", diff --git a/dev/tools/gen_defaults/data/progress_indicator.json b/dev/tools/gen_defaults/data/progress_indicator.json index c7e39cf5a3..b97b9891a0 100644 --- a/dev/tools/gen_defaults/data/progress_indicator.json +++ b/dev/tools/gen_defaults/data/progress_indicator.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.progress-indicator.active-indicator.color": "primary", "md.comp.progress-indicator.active-indicator.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/radio_button.json b/dev/tools/gen_defaults/data/radio_button.json index ccc8e67c27..b85db5db37 100644 --- a/dev/tools/gen_defaults/data/radio_button.json +++ b/dev/tools/gen_defaults/data/radio_button.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.radio-button.disabled.selected.icon.color": "onSurface", "md.comp.radio-button.disabled.selected.icon.opacity": 0.38, diff --git a/dev/tools/gen_defaults/data/search_bar.json b/dev/tools/gen_defaults/data/search_bar.json index c45d82e359..aaf2779d28 100644 --- a/dev/tools/gen_defaults/data/search_bar.json +++ b/dev/tools/gen_defaults/data/search_bar.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.search-bar.avatar.shape": "md.sys.shape.corner.full", "md.comp.search-bar.avatar.size": 30.0, diff --git a/dev/tools/gen_defaults/data/search_view.json b/dev/tools/gen_defaults/data/search_view.json index 6c75abf044..e779b9b2e9 100644 --- a/dev/tools/gen_defaults/data/search_view.json +++ b/dev/tools/gen_defaults/data/search_view.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.search-view.container.color": "surfaceContainerHigh", "md.comp.search-view.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/segmented_button_outlined.json b/dev/tools/gen_defaults/data/segmented_button_outlined.json index 8260697084..b2bf4c2a00 100644 --- a/dev/tools/gen_defaults/data/segmented_button_outlined.json +++ b/dev/tools/gen_defaults/data/segmented_button_outlined.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.outlined-segmented-button.container.height": 40.0, "md.comp.outlined-segmented-button.disabled.icon.color": "onSurface", diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json index a0c81ccc85..4f7c071186 100644 --- a/dev/tools/gen_defaults/data/shape.json +++ b/dev/tools/gen_defaults/data/shape.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.sys.shape.corner.extra-large": { "family": "SHAPE_FAMILY_ROUNDED_CORNERS", diff --git a/dev/tools/gen_defaults/data/sheet_bottom.json b/dev/tools/gen_defaults/data/sheet_bottom.json index f53c62f098..b2da2da7bb 100644 --- a/dev/tools/gen_defaults/data/sheet_bottom.json +++ b/dev/tools/gen_defaults/data/sheet_bottom.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.sheet.bottom.docked.container.color": "surfaceContainerLow", "md.comp.sheet.bottom.docked.container.shape": "md.sys.shape.corner.extra-large.top", diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json index d47f996ae7..b397f69bd0 100644 --- a/dev/tools/gen_defaults/data/slider.json +++ b/dev/tools/gen_defaults/data/slider.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.slider.active.handle.height": 44.0, "md.comp.slider.active.handle.leading-space": 6.0, @@ -23,7 +23,6 @@ "md.comp.slider.focus.active.track.color": "primary", "md.comp.slider.focus.handle.width": 2.0, "md.comp.slider.focus.inactive.track.color": "secondaryContainer", - "md.comp.slider.focus.stop.color": "primary", "md.comp.slider.handle.color": "primary", "md.comp.slider.handle.height": 44.0, "md.comp.slider.handle.shape": "md.sys.shape.corner.full", @@ -32,7 +31,6 @@ "md.comp.slider.inactive.track.color": "secondaryContainer", "md.comp.slider.inactive.track.height": 16.0, "md.comp.slider.inactive.track.shape": "md.sys.shape.corner.full", - "md.comp.slider.label.label-text.color": "onInverseSurface", "md.comp.slider.pressed.active.track.color": "primary", "md.comp.slider.pressed.handle.color": "primary", "md.comp.slider.pressed.handle.width": 2.0, diff --git a/dev/tools/gen_defaults/data/snackbar.json b/dev/tools/gen_defaults/data/snackbar.json index 22d1bd1f0b..efba8d6a79 100644 --- a/dev/tools/gen_defaults/data/snackbar.json +++ b/dev/tools/gen_defaults/data/snackbar.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.snackbar.action.focus.label-text.color": "inversePrimary", "md.comp.snackbar.action.focus.state-layer.color": "inversePrimary", diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json index c265d8a9d3..390b5321a2 100644 --- a/dev/tools/gen_defaults/data/state.json +++ b/dev/tools/gen_defaults/data/state.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.sys.state.dragged.state-layer-opacity": 0.16, "md.sys.state.focus.state-layer-opacity": 0.1, diff --git a/dev/tools/gen_defaults/data/switch.json b/dev/tools/gen_defaults/data/switch.json index cfc1d64076..47dfc8ed3a 100644 --- a/dev/tools/gen_defaults/data/switch.json +++ b/dev/tools/gen_defaults/data/switch.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.switch.disabled.selected.handle.color": "surface", "md.comp.switch.disabled.selected.handle.opacity": 1.0, diff --git a/dev/tools/gen_defaults/data/text_field_filled.json b/dev/tools/gen_defaults/data/text_field_filled.json index ca4cf5b14f..cfa05b771e 100644 --- a/dev/tools/gen_defaults/data/text_field_filled.json +++ b/dev/tools/gen_defaults/data/text_field_filled.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.filled-text-field.active-indicator.color": "onSurfaceVariant", "md.comp.filled-text-field.active-indicator.height": 1.0, diff --git a/dev/tools/gen_defaults/data/text_field_outlined.json b/dev/tools/gen_defaults/data/text_field_outlined.json index a75af88ccb..7c29c47f9a 100644 --- a/dev/tools/gen_defaults/data/text_field_outlined.json +++ b/dev/tools/gen_defaults/data/text_field_outlined.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.outlined-text-field.caret.color": "primary", "md.comp.outlined-text-field.container.shape": "md.sys.shape.corner.extra-small", diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json index 4f4d45abf2..450b10adba 100644 --- a/dev/tools/gen_defaults/data/text_style.json +++ b/dev/tools/gen_defaults/data/text_style.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "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/time_picker.json b/dev/tools/gen_defaults/data/time_picker.json index ca322467b6..8fcff53781 100644 --- a/dev/tools/gen_defaults/data/time_picker.json +++ b/dev/tools/gen_defaults/data/time_picker.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.time-picker.clock-dial.color": "surfaceContainerHighest", "md.comp.time-picker.clock-dial.container.size": 256.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 index c6e6280144..f4a5ef7b01 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_large.json +++ b/dev/tools/gen_defaults/data/top_app_bar_large.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.top-app-bar.large.container.color": "surface", "md.comp.top-app-bar.large.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/top_app_bar_medium.json b/dev/tools/gen_defaults/data/top_app_bar_medium.json index f2a14c9b2a..d6bf4bbe6f 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_medium.json +++ b/dev/tools/gen_defaults/data/top_app_bar_medium.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.top-app-bar.medium.container.color": "surface", "md.comp.top-app-bar.medium.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/top_app_bar_small.json b/dev/tools/gen_defaults/data/top_app_bar_small.json index 418f892f6a..6be95432ac 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_small.json +++ b/dev/tools/gen_defaults/data/top_app_bar_small.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.comp.top-app-bar.small.container.color": "surface", "md.comp.top-app-bar.small.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/typeface.json b/dev/tools/gen_defaults/data/typeface.json index 75e5237836..71a47b8443 100644 --- a/dev/tools/gen_defaults/data/typeface.json +++ b/dev/tools/gen_defaults/data/typeface.json @@ -1,5 +1,5 @@ { - "version": "4_0_0", + "version": "v4_1_0", "md.ref.typeface.brand": "Roboto", "md.ref.typeface.plain": "Roboto", diff --git a/dev/tools/gen_defaults/generated/used_tokens.csv b/dev/tools/gen_defaults/generated/used_tokens.csv index 254ae16793..544757e2b5 100644 --- a/dev/tools/gen_defaults/generated/used_tokens.csv +++ b/dev/tools/gen_defaults/generated/used_tokens.csv @@ -1,4 +1,4 @@ -Versions used, 4_0_0 +Versions used, v4_1_0 md.comp.assist-chip.container.shape, md.comp.assist-chip.disabled.label-text.color, md.comp.assist-chip.elevated.container.color,