commit edc7917521ab73e5d737ae03ae8e38fb120fbce0
author Jason Chang <jasonsfchang@google.com> Fri Jul 16 18:55:08 2021 +0800
committer Jason Chang <jasonsfchang@google.com> Wed Jul 21 11:54:52 2021 +0800
tree 80f9970f205dd0aba3f3d1c9952a7a9e01dd3fc7
parent b68f4cdb0b9fa8ac65721d7027ce4ab51217f234

Fix unable to swipe up to exit one-handed mode under
2 button navigation

Remove redundant condition checking when consuming One-handed mode
gesture events.

Bug: 193761450

Test: manual
Test: atest WMShellUnitTests
Change-Id: Id4687cb579c17d7de1a08b32c003e656cbbce820

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);