commit 3b1df8d735686cbb2c73ae019692468bb44c6e2d
author Bill Lin <lbill@google.com> Tue Apr 27 03:37:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 27 03:37:31 2021 +0000
tree c3fb65e4192bcc04da5b4c8dd71879fbe5737035
parent 1b195c9ff4498b8b96bddbd6dcd0c523516e8ce9
parent d7b6a429cd3d1eea3e1b6f6f9a9edf2cba10597b

Merge "Revert "2/ Resolve gesture one handed conflicts swipe up recents"" into sc-dev

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 18c0b7a..f3fe0b4 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -515,8 +515,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");
@@ -545,7 +544,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);