From ef819708a858fc14d331ee4638430d0be7e69532 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 26 Apr 2021 13:00:00 +0000
Subject: [PATCH] Revert "2/ Resolve gesture one handed conflicts swipe up
 recents"

This reverts commit 789aa86617c99f290ec2cc25cb3539b0f4feaedf.

Reason for revert: for clarify b/186197537

Change-Id: Ia921d073c2ad4e427c5436370313c2095f2adea8
(cherry picked from commit d7b6a429cd3d1eea3e1b6f6f9a9edf2cba10597b)
---
 .../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 18c0b7a1ef..f3fe0b49a4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -515,8 +515,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
             }
             mRotationTouchHelper.setOrientationTransformIfNeeded(event);
 
-            if (!mDeviceState.isOneHandedModeActive()
-                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
+            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
                 if (TestProtocol.sDebugTracing) {
                     Log.d(TestProtocol.NO_SWIPE_TO_HOME,
                             "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -545,7 +544,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
                             InputConsumer.NO_OP, mInputMonitorCompat,
                             mDeviceState,
                             event);
-                } else if (mDeviceState.canTriggerOneHandedAction(event)) {
+                } else if (mDeviceState.canTriggerOneHandedAction(event)
+                    && !mDeviceState.isOneHandedModeActive()) {
                     // Consume gesture event for triggering one handed feature.
                     mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
                         InputConsumer.NO_OP, mInputMonitorCompat);