commit f8feb0abf3b7d4af12f5dfa879937c42745d1974
author Jason Chang <jasonsfchang@google.com> Fri May 28 04:05:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 28 04:05:12 2021 +0000
tree c75cfa72a40e5059d788d9791f90561c7168abb8
parent 674bcd815fbb5b4b8d88860fa8a15725b81df304
parent d46df5915f342d0802801247434976216fb11457

Merge "Migrate trigger logic to fullfill new UI changes for One-handed mode settings." into sc-dev am: 9bc712f267 am: 92f45a5019 am: d46df5915f

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

Change-Id: I7429ea6d5fac4177b77489ffe20658b5ccab90ed

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index e821e06..fa37901 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -561,7 +561,7 @@
             return false;
         }
 
-        if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) {
+        if (mIsOneHandedModeEnabled) {
             final Info displayInfo = mDisplayController.getInfo();
             return (mRotationTouchHelper.touchInOneHandedModeRegion(ev)
                 && displayInfo.rotation != Surface.ROTATION_90

quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
index 8d9c524..bc20902 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java
@@ -147,12 +147,10 @@
     }
 
     private void onStartGestureDetected() {
-        if (mDeviceState.isOneHandedModeEnabled()) {
-            if (!mDeviceState.isOneHandedModeActive()) {
-                SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
-            }
-        } else if (mDeviceState.isSwipeToNotificationEnabled()) {
+        if (mDeviceState.isSwipeToNotificationEnabled()) {
             SystemUiProxy.INSTANCE.get(mContext).expandNotificationPanel();
+        } else if (!mDeviceState.isOneHandedModeActive()) {
+            SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode();
         }
     }