From da85cb91f16968abc86d89a6767172361afb6abc Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Thu, 13 May 2021 17:20:05 +0800 Subject: [PATCH] Migrate trigger logic to fullfill new UI changes for One-handed mode settings. According to new key visual changes for One-handed mode, modify the trigger condition to reflect the changes. Bug: 175851783 Test: manual Test: atest WMShellUnitTests Change-Id: I4d734b31cafd5ce884010642b5e613c3deadfb20 --- .../android/quickstep/RecentsAnimationDeviceState.java | 2 +- .../inputconsumers/OneHandedModeInputConsumer.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index e821e06180..fa37901f27 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -561,7 +561,7 @@ public class RecentsAnimationDeviceState implements return false; } - if (mIsOneHandedModeEnabled || mIsSwipeToNotificationEnabled) { + if (mIsOneHandedModeEnabled) { final Info displayInfo = mDisplayController.getInfo(); return (mRotationTouchHelper.touchInOneHandedModeRegion(ev) && displayInfo.rotation != Surface.ROTATION_90 diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java index 8d9c524a57..bc209027e8 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java @@ -147,12 +147,10 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer { } 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(); } }