commit d7b6a429cd3d1eea3e1b6f6f9a9edf2cba10597b
author Bill Lin <lbill@google.com> Mon Apr 26 13:00:00 2021 +0000
committer Bill Lin <lbill@google.com> Mon Apr 26 13:00:00 2021 +0000
tree 4c3d380aa0603850803a41e251ee4da22157ff22
parent 789aa86617c99f290ec2cc25cb3539b0f4feaedf

Revert "2/ Resolve gesture one handed conflicts swipe up recents"

This reverts commit 789aa86617c99f290ec2cc25cb3539b0f4feaedf.

Reason for revert: for clarify b/186197537 

Change-Id: Ia921d073c2ad4e427c5436370313c2095f2adea8

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 417b616..e9d2eb4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -506,8 +506,7 @@
             }
             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");
@@ -536,7 +535,8 @@
                             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);