Unverified Commit 4b4783d1 authored by Xilai Zhang's avatar Xilai Zhang Committed by GitHub

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

* Revert "Exposed tooltip longPress action when available (#117338)"

This reverts commit 38e3930f.

* Revert "fixes android_semantics_integration_test to expect long press for tootip"
parent b3c321f1
...@@ -439,7 +439,6 @@ void main() { ...@@ -439,7 +439,6 @@ void main() {
ignoredActions: ignoredAccessibilityFocusActions, ignoredActions: ignoredAccessibilityFocusActions,
actions: <AndroidSemanticsAction>[ actions: <AndroidSemanticsAction>[
AndroidSemanticsAction.click, AndroidSemanticsAction.click,
AndroidSemanticsAction.longClick,
], ],
), ),
); );
......
...@@ -751,7 +751,7 @@ class TooltipState extends State<Tooltip> with SingleTickerProviderStateMixin { ...@@ -751,7 +751,7 @@ class TooltipState extends State<Tooltip> with SingleTickerProviderStateMixin {
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onLongPress: (_triggerMode == TooltipTriggerMode.longPress) ? _handlePress : null, onLongPress: (_triggerMode == TooltipTriggerMode.longPress) ? _handlePress : null,
onTap: (_triggerMode == TooltipTriggerMode.tap) ? _handleTap : null, onTap: (_triggerMode == TooltipTriggerMode.tap) ? _handleTap : null,
excludeFromSemantics: _excludeFromSemantics, excludeFromSemantics: true,
child: result, child: result,
); );
// Only check for hovering if there is a mouse connected. // Only check for hovering if there is a mouse connected.
......
...@@ -172,7 +172,6 @@ void main() { ...@@ -172,7 +172,6 @@ void main() {
hasEnabledState: true, hasEnabledState: true,
isEnabled: true, isEnabled: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isFocusable: true, isFocusable: true,
)); ));
handle.dispose(); handle.dispose();
...@@ -217,7 +216,6 @@ void main() { ...@@ -217,7 +216,6 @@ void main() {
hasEnabledState: true, hasEnabledState: true,
isEnabled: true, isEnabled: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isFocusable: true, isFocusable: true,
)); ));
handle.dispose(); handle.dispose();
......
...@@ -672,7 +672,6 @@ void main() { ...@@ -672,7 +672,6 @@ void main() {
tooltip: 'Previous month', tooltip: 'Previous month',
isButton: true, isButton: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isEnabled: true, isEnabled: true,
hasEnabledState: true, hasEnabledState: true,
isFocusable: true, isFocusable: true,
...@@ -681,7 +680,6 @@ void main() { ...@@ -681,7 +680,6 @@ void main() {
tooltip: 'Next month', tooltip: 'Next month',
isButton: true, isButton: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isEnabled: true, isEnabled: true,
hasEnabledState: true, hasEnabledState: true,
isFocusable: true, isFocusable: true,
......
...@@ -2047,10 +2047,7 @@ void main() { ...@@ -2047,10 +2047,7 @@ void main() {
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics( TestSemantics(
tooltip: 'Delete', tooltip: 'Delete',
actions: <SemanticsAction>[ actions: <SemanticsAction>[SemanticsAction.tap],
SemanticsAction.tap,
SemanticsAction.longPress
],
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
SemanticsFlag.isButton, SemanticsFlag.isButton,
......
...@@ -833,7 +833,6 @@ void main() { ...@@ -833,7 +833,6 @@ void main() {
tooltip: 'Switch to input', tooltip: 'Switch to input',
isButton: true, isButton: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isEnabled: true, isEnabled: true,
hasEnabledState: true, hasEnabledState: true,
isFocusable: true, isFocusable: true,
...@@ -877,7 +876,6 @@ void main() { ...@@ -877,7 +876,6 @@ void main() {
tooltip: 'Switch to calendar', tooltip: 'Switch to calendar',
isButton: true, isButton: true,
hasTapAction: true, hasTapAction: true,
hasLongPressAction: true,
isEnabled: true, isEnabled: true,
hasEnabledState: true, hasEnabledState: true,
isFocusable: true, isFocusable: true,
......
...@@ -700,7 +700,6 @@ void main() { ...@@ -700,7 +700,6 @@ void main() {
tooltip: 'Add Photo', tooltip: 'Add Photo',
actions: <SemanticsAction>[ actions: <SemanticsAction>[
SemanticsAction.tap, SemanticsAction.tap,
SemanticsAction.longPress,
], ],
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState, SemanticsFlag.hasEnabledState,
......
...@@ -620,10 +620,7 @@ void main() { ...@@ -620,10 +620,7 @@ void main() {
SemanticsFlag.isEnabled, SemanticsFlag.isEnabled,
SemanticsFlag.isFocusable, SemanticsFlag.isFocusable,
], ],
actions: <SemanticsAction>[ actions: <SemanticsAction>[SemanticsAction.tap],
SemanticsAction.tap,
SemanticsAction.longPress,
],
tooltip: 'Back', tooltip: 'Back',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
), ),
......
...@@ -1420,9 +1420,6 @@ void main() { ...@@ -1420,9 +1420,6 @@ void main() {
id: 1, id: 1,
tooltip: 'TIP', tooltip: 'TIP',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
actions: <SemanticsAction>[
SemanticsAction.longPress,
],
), ),
], ],
); );
...@@ -1623,9 +1620,6 @@ void main() { ...@@ -1623,9 +1620,6 @@ void main() {
tooltip: 'Foo', tooltip: 'Foo',
label: 'Bar', label: 'Bar',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
actions: <SemanticsAction>[
SemanticsAction.longPress,
],
), ),
], ],
), ),
......
...@@ -1075,9 +1075,6 @@ void main() { ...@@ -1075,9 +1075,6 @@ void main() {
tooltip: 'Foo', tooltip: 'Foo',
label: 'Bar', label: 'Bar',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
actions: <SemanticsAction>[
SemanticsAction.longPress,
],
), ),
], ],
), ),
...@@ -1121,9 +1118,6 @@ void main() { ...@@ -1121,9 +1118,6 @@ void main() {
tooltip: 'Foo', tooltip: 'Foo',
label: 'Bar', label: 'Bar',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
actions: <SemanticsAction>[
SemanticsAction.longPress,
],
), ),
], ],
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment