[flutter roll] Revert both #117338 and #117547 (#117557)

* Revert "Exposed tooltip longPress action when available (#117338)" This reverts commit 38e3930. * Revert "fixes android_semantics_integration_test to expect long press for tootip"
flutter · Dec 23, 2022 · 4b4783d · 4b4783d
1 parent b3c321f
commit 4b4783d
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 29 deletions.
diff --git a/dev/integration_tests/android_semantics_testing/test_driver/main_test.dart b/dev/integration_tests/android_semantics_testing/test_driver/main_test.dart
@@ -439,7 +439,6 @@ void main() {
             ignoredActions: ignoredAccessibilityFocusActions,
             actions: <AndroidSemanticsAction>[
               AndroidSemanticsAction.click,
-              AndroidSemanticsAction.longClick,
             ],
           ),
         );

diff --git a/packages/flutter/lib/src/material/tooltip.dart b/packages/flutter/lib/src/material/tooltip.dart
@@ -751,7 +751,7 @@ class TooltipState extends State<Tooltip> with SingleTickerProviderStateMixin {
         behavior: HitTestBehavior.opaque,
         onLongPress: (_triggerMode == TooltipTriggerMode.longPress) ? _handlePress : null,
         onTap: (_triggerMode == TooltipTriggerMode.tap) ? _handleTap : null,
-        excludeFromSemantics: _excludeFromSemantics,
+        excludeFromSemantics: true,
         child: result,
       );
       // Only check for hovering if there is a mouse connected.

diff --git a/packages/flutter/test/material/back_button_test.dart b/packages/flutter/test/material/back_button_test.dart
@@ -172,7 +172,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasLongPressAction: true,
       isFocusable: true,
     ));
     handle.dispose();
@@ -217,7 +216,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasLongPressAction: true,
       isFocusable: true,
     ));
     handle.dispose();

diff --git a/packages/flutter/test/material/calendar_date_picker_test.dart b/packages/flutter/test/material/calendar_date_picker_test.dart
@@ -672,7 +672,6 @@ void main() {
           tooltip: 'Previous month',
           isButton: true,
           hasTapAction: true,
-          hasLongPressAction: true,
           isEnabled: true,
           hasEnabledState: true,
           isFocusable: true,
@@ -681,7 +680,6 @@ void main() {
           tooltip: 'Next month',
           isButton: true,
           hasTapAction: true,
-          hasLongPressAction: true,
           isEnabled: true,
           hasEnabledState: true,
           isFocusable: true,

diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
@@ -2047,10 +2047,7 @@ void main() {
                             children: <TestSemantics>[
                               TestSemantics(
                                 tooltip: 'Delete',
-                                actions: <SemanticsAction>[
-                                  SemanticsAction.tap,
-                                  SemanticsAction.longPress
-                                ],
+                                actions: <SemanticsAction>[SemanticsAction.tap],
                                 textDirection: TextDirection.ltr,
                                 flags: <SemanticsFlag>[
                                   SemanticsFlag.isButton,

diff --git a/packages/flutter/test/material/date_picker_test.dart b/packages/flutter/test/material/date_picker_test.dart
@@ -833,7 +833,6 @@ void main() {
           tooltip: 'Switch to input',
           isButton: true,
           hasTapAction: true,
-          hasLongPressAction: true,
           isEnabled: true,
           hasEnabledState: true,
           isFocusable: true,
@@ -877,7 +876,6 @@ void main() {
           tooltip: 'Switch to calendar',
           isButton: true,
           hasTapAction: true,
-          hasLongPressAction: true,
           isEnabled: true,
           hasEnabledState: true,
           isFocusable: true,

diff --git a/packages/flutter/test/material/floating_action_button_test.dart b/packages/flutter/test/material/floating_action_button_test.dart
@@ -700,7 +700,6 @@ void main() {
                       tooltip: 'Add Photo',
                       actions: <SemanticsAction>[
                         SemanticsAction.tap,
-                        SemanticsAction.longPress,
                       ],
                       flags: <SemanticsFlag>[
                         SemanticsFlag.hasEnabledState,

diff --git a/packages/flutter/test/material/search_test.dart b/packages/flutter/test/material/search_test.dart
@@ -620,10 +620,7 @@ void main() {
                               SemanticsFlag.isEnabled,
                               SemanticsFlag.isFocusable,
                             ],
-                            actions: <SemanticsAction>[
-                              SemanticsAction.tap,
-                              SemanticsAction.longPress,
-                            ],
+                            actions: <SemanticsAction>[SemanticsAction.tap],
                             tooltip: 'Back',
                             textDirection: TextDirection.ltr,
                           ),

diff --git a/packages/flutter/test/material/tooltip_test.dart b/packages/flutter/test/material/tooltip_test.dart
@@ -1420,9 +1420,6 @@ void main() {
           id: 1,
           tooltip: 'TIP',
           textDirection: TextDirection.ltr,
-          actions: <SemanticsAction>[
-            SemanticsAction.longPress,
-          ],
         ),
       ],
     );
@@ -1623,9 +1620,6 @@ void main() {
                       tooltip: 'Foo',
                       label: 'Bar',
                       textDirection: TextDirection.ltr,
-                      actions: <SemanticsAction>[
-                        SemanticsAction.longPress,
-                      ],
                     ),
                   ],
                 ),

diff --git a/packages/flutter/test/material/tooltip_theme_test.dart b/packages/flutter/test/material/tooltip_theme_test.dart
@@ -1075,9 +1075,6 @@ void main() {
                       tooltip: 'Foo',
                       label: 'Bar',
                       textDirection: TextDirection.ltr,
-                      actions: <SemanticsAction>[
-                        SemanticsAction.longPress,
-                      ],
                     ),
                   ],
                 ),
@@ -1121,9 +1118,6 @@ void main() {
                       tooltip: 'Foo',
                       label: 'Bar',
                       textDirection: TextDirection.ltr,
-                      actions: <SemanticsAction>[
-                        SemanticsAction.longPress,
-                      ],
                     ),
                   ],
                 ),