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

2021-07-22 09:43:13 +00:00 · 2021-07-22 09:43:13 +00:00 · 1b3f5d3883
parent 46378eb881 edc7917521
commit 1b3f5d3883
1 changed files with 1 additions and 2 deletions
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@ -564,8 +564,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
                } 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);