Revert "Fix ExpansionTile hint for Android (#120881)" (#121624)

This reverts commit fd65fd1.

Author: XilaiZhang

packages/flutter/lib/src/material/expansion_tile.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'color_scheme.dart';
@@ -12,7 +11,6 @@ import 'icons.dart';
 import 'list_tile.dart';
 import 'list_tile_theme.dart';
 import 'material.dart';
-import 'material_localizations.dart';
 import 'theme.dart';
 
 const Duration _kExpand = Duration(milliseconds: 200);
@@ -360,9 +358,6 @@ class _ExpansionTileState extends State<ExpansionTile> with SingleTickerProvider
   }
 
   void _handleTap() {
-    final TextDirection textDirection = Directionality.of(context);
-    final MaterialLocalizations localizations = MaterialLocalizations.of(context);
-    final String stateHint = _isExpanded ? localizations.expandedHint : localizations.collapsedHint;
     setState(() {
       _isExpanded = !_isExpanded;
       if (_isExpanded) {
@@ -380,7 +375,6 @@ class _ExpansionTileState extends State<ExpansionTile> with SingleTickerProvider
       PageStorage.maybeOf(context)?.writeState(context, _isExpanded);
     });
     widget.onExpansionChanged?.call(_isExpanded);
-    SemanticsService.announce(stateHint, textDirection);
   }
 
   // Platform or null affinity defaults to trailing.
@@ -499,10 +493,6 @@ class _ExpansionTileState extends State<ExpansionTile> with SingleTickerProvider
     final ExpansionTileThemeData expansionTileTheme = ExpansionTileTheme.of(context);
     final bool closed = !_isExpanded && _controller.isDismissed;
     final bool shouldRemoveChildren = closed && !widget.maintainState;
-    final MaterialLocalizations localizations = MaterialLocalizations.of(context);
-    final String onTapHint = _isExpanded
-      ? localizations.expansionTileExpandedTapHint
-      : localizations.expansionTileCollapsedTapHint;
 
     final Widget result = Offstage(
       offstage: closed,
@@ -518,13 +508,10 @@ class _ExpansionTileState extends State<ExpansionTile> with SingleTickerProvider
       ),
     );
 
-    return Semantics(
-      onTapHint: onTapHint,
-      child: AnimatedBuilder(
-        animation: _controller.view,
-        builder: _buildChildren,
-        child: shouldRemoveChildren ? null : result,
-      ),
+    return AnimatedBuilder(
+      animation: _controller.view,
+      builder: _buildChildren,
+      child: shouldRemoveChildren ? null : result,
     );
   }
 }

packages/flutter/lib/src/material/material_localizations.dart

@@ -452,18 +452,6 @@ abstract class MaterialLocalizations {
   /// The semantics hint to describe the tap action on a collapsed [ExpandIcon].
   String get collapsedIconTapHint => 'Expand';
 
-  /// The semantics hint to describe the tap action on an expanded [ExpansionTile].
-  String get expansionTileExpandedTapHint => 'Collapse';
-
-  /// The semantics hint to describe the tap action on a collapsed [ExpansionTile].
-  String get expansionTileCollapsedTapHint => 'Expand for more details';
-
-  /// The semantics hint to describe the [ExpansionTile] expanded state.
-  String get expandedHint => 'Collapsed';
-
-  /// The semantics hint to describe the [ExpansionTile] collapsed state.
-  String get collapsedHint => 'Expanded';
-
   /// The label for the [TextField]'s character counter.
   String remainingTextFieldCharacterCount(int remaining);
 
@@ -1188,18 +1176,6 @@ class DefaultMaterialLocalizations implements MaterialLocalizations {
   @override
   String get collapsedIconTapHint => 'Expand';
 
-  @override
-  String get expansionTileExpandedTapHint => 'Collapse';
-
-  @override
-  String get expansionTileCollapsedTapHint => 'Expand for more details';
-
-  @override
-  String get expandedHint => 'Collapsed';
-
-  @override
-  String get collapsedHint => 'Expanded';
-
   @override
   String get refreshIndicatorSemanticLabel => 'Refresh';
 

packages/flutter/test/material/expansion_tile_test.dart

@@ -696,106 +696,6 @@ void main() {
     expect(listTile.trailing, isNull);
   });
 
-  testWidgets('ExpansionTile Semantics', (WidgetTester tester) async {
-    tester.binding.focusManager.highlightStrategy = FocusHighlightStrategy.alwaysTraditional;
-    final SemanticsHandle handle = tester.ensureSemantics();
-    const DefaultMaterialLocalizations localizations = DefaultMaterialLocalizations();
-    await tester.pumpWidget(const MaterialApp(
-      home: Material(
-        child: Column(
-          children: <Widget>[
-            ExpansionTile(
-              title: Text('Title'),
-            ),
-            ExpansionTile(
-              initiallyExpanded: true,
-              title: Text('Title'),
-            ),
-          ],
-        ),
-      ),
-    ));
-
-    // Focus the first ExpansionTile.
-    tester.binding.focusManager.primaryFocus?.nextFocus();
-    await tester.pumpAndSettle();
-
-    // The first ExpansionTile should be collapsed and focused.
-    expect(
-      tester.getSemantics(find.byType(ExpansionTile).first),
-      matchesSemantics(
-        hasTapAction: true,
-        hasEnabledState: true,
-        isEnabled: true,
-        isFocused: true,
-        isFocusable: true,
-        label: 'Title',
-        textDirection: TextDirection.ltr,
-        // The hint should be the opposite of the current state.
-        // The first ExpansionTile is collapsed, so the hint should be
-        // "double tap to expand".
-        onTapHint: localizations.expansionTileCollapsedTapHint,
-      ),
-    );
-
-    // The second ExpansionTile should be expanded and not focused.
-    expect(
-      tester.getSemantics(find.byType(ExpansionTile).last),
-      matchesSemantics(
-        hasTapAction: true,
-        hasEnabledState: true,
-        isEnabled: true,
-        isFocusable: true,
-        label: 'Title',
-        textDirection: TextDirection.ltr,
-        // The hint should be the opposite of the current state.
-        // The second ExpansionTile is expanded, so the hint should be
-        // "double tap to collapse".
-        onTapHint: localizations.expansionTileExpandedTapHint,
-      ),
-    );
-    handle.dispose();
-  });
-
-  testWidgets('ExpansionTile Semantics announcement', (WidgetTester tester) async {
-    final SemanticsHandle handle = tester.ensureSemantics();
-    const DefaultMaterialLocalizations localizations = DefaultMaterialLocalizations();
-    await tester.pumpWidget(
-      const MaterialApp(
-        home: Material(
-          child: ExpansionTile(
-            title: Text('Title'),
-            children: <Widget>[
-              SizedBox(height: 100, width: 100),
-            ],
-          ),
-        ),
-      ),
-    );
-
-    // There is no semantics announcement without tap action.
-    expect(tester.takeAnnouncements(), isEmpty);
-
-    // Tap the title to expand ExpansionTile.
-    await tester.tap(find.text('Title'));
-    await tester.pumpAndSettle();
-
-    // The announcement should be the opposite of the current state.
-    // The ExpansionTile is expanded, so the announcement should be
-    // "Expanded".
-    expect(tester.takeAnnouncements().first.message, localizations.collapsedHint);
-
-    // Tap the title to collapse ExpansionTile.
-    await tester.tap(find.text('Title'));
-    await tester.pumpAndSettle();
-
-    // The announcement should be the opposite of the current state.
-    // The ExpansionTile is collapsed, so the announcement should be
-    // "Collapsed".
-    expect(tester.takeAnnouncements().first.message, localizations.expandedHint);
-    handle.dispose();
-  });
-
   group('Material 2', () {
     // Tests that are only relevant for Material 2. Once ThemeData.useMaterial3
     // is turned on by default, these tests can be removed.

packages/flutter/test/material/localizations_test.dart

@@ -75,10 +75,6 @@ void main() {
     expect(localizations.reorderItemDown, isNotNull);
     expect(localizations.reorderItemLeft, isNotNull);
     expect(localizations.reorderItemRight, isNotNull);
-    expect(localizations.expandedIconTapHint, isNotNull);
-    expect(localizations.collapsedIconTapHint, isNotNull);
-    expect(localizations.expandedHint, isNotNull);
-    expect(localizations.collapsedHint, isNotNull);
     expect(localizations.keyboardKeyAlt, isNotNull);
     expect(localizations.keyboardKeyAltGraph, isNotNull);
     expect(localizations.keyboardKeyBackspace, isNotNull);