commit 9008a57ae677c8840bd671e9eb0354dec5a2ce37
author Jason Chang <jasonsfchang@google.com> Thu Jul 22 17:28:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 17:28:02 2021 +0000
tree 0180fe79a09bbd42b020bf5e2e4f37b6d4c052ea
parent 2482a19429edd6a4052e6d7ffd4e485e66bf0aed
parent 12a0357c3142f2f8e5430dbbb032a44a24092360

Merge "Fix unable to swipe up to exit one-handed mode under 2 button navigation" into sc-dev am: 1b3f5d3883 am: 12a0357c31

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

Change-Id: I9abbe0fc14aee95f9195fada302c380f3a84d861

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 b038c7b..e55f1d1 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -583,8 +583,7 @@
                 } else {
                     mUncheckedConsumer = InputConsumer.NO_OP;
                 }
-            } 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);