commit 1b3f5d3883789b9a06ab6caf5e5ed0358b0b7a7d
author Jason Chang <jasonsfchang@google.com> Thu Jul 22 09:43:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 09:43:13 2021 +0000
tree 20386f6ebc49d6e42ae154425530a7cac51695ce
parent 46378eb881ab96b90a7a2922775ecceb184456c7
parent edc7917521ab73e5d737ae03ae8e38fb120fbce0

Merge "Fix unable to swipe up to exit one-handed mode under 2 button navigation" 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 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);