From 265ef1efb8b510df3148f5aa69cb2991e1b98aed Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Mon, 27 Jun 2022 13:10:05 -0700
Subject: [PATCH] Export SpellOutStringAttribute and LocaleStringAttribute
 (#106682)

---
 packages/flutter/lib/semantics.dart           |  2 ++
 .../test/semantics/semantics_test.dart        |  2 --
 .../test/semantics/semantics_update_test.dart | 21 +++++++++----------
 .../flutter/test/widgets/rich_text_test.dart  |  2 --
 .../test/widgets/semantics_tester.dart        |  2 --
 packages/flutter_test/lib/src/matchers.dart   |  1 -
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/flutter/lib/semantics.dart b/packages/flutter/lib/semantics.dart
index 7d252d9a0da..06e7d413339 100644
--- a/packages/flutter/lib/semantics.dart
+++ b/packages/flutter/lib/semantics.dart
@@ -13,6 +13,8 @@
 /// and is used by the platform-specific accessibility services.
 library semantics;
 
+export 'dart:ui' show LocaleStringAttribute, SpellOutStringAttribute;
+
 export 'src/semantics/binding.dart';
 export 'src/semantics/debug.dart';
 export 'src/semantics/semantics.dart';
diff --git a/packages/flutter/test/semantics/semantics_test.dart b/packages/flutter/test/semantics/semantics_test.dart
index b04ef32f209..89f6d733391 100644
--- a/packages/flutter/test/semantics/semantics_test.dart
+++ b/packages/flutter/test/semantics/semantics_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
-
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vector_math/vector_math_64.dart';
diff --git a/packages/flutter/test/semantics/semantics_update_test.dart b/packages/flutter/test/semantics/semantics_update_test.dart
index 72bdcbada49..d7cda6e98f6 100644
--- a/packages/flutter/test/semantics/semantics_update_test.dart
+++ b/packages/flutter/test/semantics/semantics_update_test.dart
@@ -4,7 +4,6 @@
 
 import 'dart:typed_data';
 import 'dart:ui' as ui;
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';
@@ -198,15 +197,15 @@ class SemanticsUpdateBuilderSpy extends ui.SemanticsUpdateBuilder {
     required double thickness,
     required Rect rect,
     required String label,
-    List<ui.StringAttribute>? labelAttributes,
+    List<StringAttribute>? labelAttributes,
     required String value,
-    List<ui.StringAttribute>? valueAttributes,
+    List<StringAttribute>? valueAttributes,
     required String increasedValue,
-    List<ui.StringAttribute>? increasedValueAttributes,
+    List<StringAttribute>? increasedValueAttributes,
     required String decreasedValue,
-    List<ui.StringAttribute>? decreasedValueAttributes,
+    List<StringAttribute>? decreasedValueAttributes,
     required String hint,
-    List<ui.StringAttribute>? hintAttributes,
+    List<StringAttribute>? hintAttributes,
     String? tooltip,
     TextDirection? textDirection,
     required Float64List transform,
@@ -304,15 +303,15 @@ class SemanticsNodeUpdateObservation {
   final double thickness;
   final Rect rect;
   final String label;
-  final List<ui.StringAttribute>? labelAttributes;
+  final List<StringAttribute>? labelAttributes;
   final String value;
-  final List<ui.StringAttribute>? valueAttributes;
+  final List<StringAttribute>? valueAttributes;
   final String increasedValue;
-  final List<ui.StringAttribute>? increasedValueAttributes;
+  final List<StringAttribute>? increasedValueAttributes;
   final String decreasedValue;
-  final List<ui.StringAttribute>? decreasedValueAttributes;
+  final List<StringAttribute>? decreasedValueAttributes;
   final String hint;
-  final List<ui.StringAttribute>? hintAttributes;
+  final List<StringAttribute>? hintAttributes;
   final TextDirection? textDirection;
   final Float64List transform;
   final Int32List childrenInTraversalOrder;
diff --git a/packages/flutter/test/widgets/rich_text_test.dart b/packages/flutter/test/widgets/rich_text_test.dart
index 83207b9a4e9..5cae15358ce 100644
--- a/packages/flutter/test/widgets/rich_text_test.dart
+++ b/packages/flutter/test/widgets/rich_text_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui';
-
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
diff --git a/packages/flutter/test/widgets/semantics_tester.dart b/packages/flutter/test/widgets/semantics_tester.dart
index 91537d43cb8..5cf5138cb70 100644
--- a/packages/flutter/test/widgets/semantics_tester.dart
+++ b/packages/flutter/test/widgets/semantics_tester.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:ui' show LocaleStringAttribute, SemanticsFlag, SpellOutStringAttribute;
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/physics.dart';
 import 'package:flutter/rendering.dart';
diff --git a/packages/flutter_test/lib/src/matchers.dart b/packages/flutter_test/lib/src/matchers.dart
index f49f75ee276..f92b434797a 100644
--- a/packages/flutter_test/lib/src/matchers.dart
+++ b/packages/flutter_test/lib/src/matchers.dart
@@ -4,7 +4,6 @@
 
 import 'dart:math' as math;
 import 'dart:ui' as ui;
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' show Card;