From 789aa86617c99f290ec2cc25cb3539b0f4feaedf Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 19 Apr 2021 20:39:15 +0800
Subject: [PATCH] 2/ Resolve gesture one handed conflicts swipe up recents

When user trigger OHM, we should stop user going to both recents
and quick switch until user exit one handed mode.

The previous design is quite flickering due to below gestures
are in race condition:
1) One handed mode swipe up to exit
2) Swipe up to recents
3) Swipe horizontal to quick switch

Test: manual
Bug: 177978035
Change-Id: I10206ba9c263ead24a83a9ee0ffea2ea45eb819d
---
 .../src/com/android/quickstep/TouchInteractionService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index e9d2eb4632..417b6166d4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -506,7 +506,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
-            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+            if (!mDeviceState.isOneHandedModeActive()
+                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
                 if (TestProtocol.sDebugTracing) {
                     Log.d(TestProtocol.NO_SWIPE_TO_HOME,
                             "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -535,8 +536,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mDeviceState,
                             event);
-                } else if (mDeviceState.canTriggerOneHandedAction(event)
-                    && !mDeviceState.isOneHandedModeActive()) {
+                } else if (mDeviceState.canTriggerOneHandedAction(event)) {
                     // Consume gesture event for triggering one handed feature.
                     mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);