commit 0476be4a356420977f008a53f48612b5288c075b
author Jason Chang <jasonsfchang@google.com> Thu Jul 22 10:06:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 10:06:24 2021 +0000
tree eddb49be8f3ebf5773ed9d9c065891afd28a6761
parent 076ee3dcfc904bfea9f7b47d49b1f42f59395416
parent 1b3f5d3883789b9a06ab6caf5e5ed0358b0b7a7d

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

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

Change-Id: I073ad3902e3e47832d97a181428c980ea1c7b96f

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 069ed11..b6dc833 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -564,8 +564,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);