commit 8361e77bb18bf01afee723b7eafa710a8b7910c6
author Bill Lin <lbill@google.com> Wed Apr 28 03:23:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 28 03:23:06 2021 +0000
tree 027f68b137581768fa648c9f9cad836d9a03b714
parent bc5bd1e361e6640b54a4302d43973ab311368c10
parent 0bcfe825fc27da5e3e60b34a9e6e9cf65720e969

Merge "Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..."" into sc-dev am: 0bcfe825fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14319875

Change-Id: Ic44c35882e208e2d9ee336b1e2d6908d9f59f0ff

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 c74f53b..4fc9770 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -517,7 +517,8 @@
             }
             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");
@@ -546,8 +547,7 @@
                             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);