diff --git a/lib/ui/fixtures/ui_test.dart b/lib/ui/fixtures/ui_test.dart index 7a79cda95caea..d1c482e93dc90 100644 --- a/lib/ui/fixtures/ui_test.dart +++ b/lib/ui/fixtures/ui_test.dart @@ -145,6 +145,7 @@ external void _validateVertices(Vertices vertices); @pragma('vm:entry-point') void sendSemanticsUpdate() { final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder(); + final String identifier = "identifier"; final String label = "label"; final List labelAttributes = [ SpellOutStringAttribute(range: TextRange(start: 1, end: 2)), @@ -212,6 +213,7 @@ void sendSemanticsUpdate() { rect: Rect.fromLTRB(0, 0, 10, 10), elevation: 0, thickness: 0, + identifier: identifier, label: label, labelAttributes: labelAttributes, value: value, diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index 7323f64a9ea0a..6d2283bdac3cd 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -807,8 +807,7 @@ abstract class SemanticsUpdateBuilder { required double elevation, required double thickness, required Rect rect, - // TODO(bartekpacia): Re-add once migration is complete - // String identifier, + required String identifier, required String label, required List labelAttributes, required String value, @@ -878,8 +877,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1 implem required double elevation, required double thickness, required Rect rect, - // TODO(bartekpacia): Re-add once migration is complete - // String identifier, + required String identifier, required String label, required List labelAttributes, required String value, @@ -918,8 +916,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1 implem rect.bottom, elevation, thickness, - // TODO(bartekpacia): Pass real identifier parameter once migration is complete - '', + identifier, label, labelAttributes, value, diff --git a/lib/web_ui/lib/semantics.dart b/lib/web_ui/lib/semantics.dart index 5ccf9e04664d7..fb5a5572c87e8 100644 --- a/lib/web_ui/lib/semantics.dart +++ b/lib/web_ui/lib/semantics.dart @@ -360,8 +360,7 @@ class SemanticsUpdateBuilder { required double elevation, required double thickness, required Rect rect, - // TODO(bartekpacia): Re-add once migration is complete - // String identifier, + required String identifier, required String label, required List labelAttributes, required String value, @@ -396,8 +395,7 @@ class SemanticsUpdateBuilder { scrollExtentMax: scrollExtentMax, scrollExtentMin: scrollExtentMin, rect: rect, - // TODO(bartekpacia): Pass real identifier parameter once migration is complete - identifier: '', + identifier: identifier, label: label, labelAttributes: labelAttributes, value: value, diff --git a/lib/web_ui/test/engine/semantics/semantics_test.dart b/lib/web_ui/test/engine/semantics/semantics_test.dart index 2ace112a3ef17..91ffa4965c1b3 100644 --- a/lib/web_ui/test/engine/semantics/semantics_test.dart +++ b/lib/web_ui/test/engine/semantics/semantics_test.dart @@ -3092,8 +3092,7 @@ void updateNode( elevation: elevation, thickness: thickness, rect: rect, - // TODO(bartekpacia): Pass real identifier parameter once migration is complete - // identifier: '', + identifier: identifier, label: label, labelAttributes: labelAttributes, hint: hint, diff --git a/shell/platform/embedder/fixtures/main.dart b/shell/platform/embedder/fixtures/main.dart index 7687dca71437f..5d9bc6d0b4382 100644 --- a/shell/platform/embedder/fixtures/main.dart +++ b/shell/platform/embedder/fixtures/main.dart @@ -137,6 +137,7 @@ Future a11y_main() async { final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder() ..updateNode( id: 42, + identifier: '', label: 'A: root', labelAttributes: [], rect: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0), @@ -170,6 +171,7 @@ Future a11y_main() async { ) ..updateNode( id: 84, + identifier: '', label: 'B: leaf', labelAttributes: [], rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0), @@ -203,6 +205,7 @@ Future a11y_main() async { ) ..updateNode( id: 96, + identifier: '', label: 'C: branch', labelAttributes: [], rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0), @@ -236,6 +239,7 @@ Future a11y_main() async { ) ..updateNode( id: 128, + identifier: '', label: 'D: leaf', labelAttributes: [], rect: Rect.fromLTRB(40.0, 40.0, 80.0, 80.0), @@ -301,6 +305,7 @@ Future a11y_string_attributes() async { final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder() ..updateNode( id: 42, + identifier: 'identifier', label: 'What is the meaning of life?', labelAttributes: [ LocaleStringAttribute( diff --git a/testing/scenario_app/lib/src/locale_initialization.dart b/testing/scenario_app/lib/src/locale_initialization.dart index 1185d9b8efe09..74eceaa53a526 100644 --- a/testing/scenario_app/lib/src/locale_initialization.dart +++ b/testing/scenario_app/lib/src/locale_initialization.dart @@ -49,6 +49,7 @@ class LocaleInitialization extends Scenario { // SemanticsAction.tap. actions: 1, rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0), + identifier: '', label: view.platformDispatcher.locales.toString(), labelAttributes: [], textDirection: TextDirection.ltr, @@ -107,6 +108,7 @@ class LocaleInitialization extends Scenario { // SemanticsAction.tap. actions: 1, rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0), + identifier: '', label: label, labelAttributes: [], textDirection: TextDirection.ltr,