From 22757e840c7f6e7bad4df782c5f0bcf5cc811e20 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 22 Apr 2020 17:49:09 -0500 Subject: [PATCH] Don't allow swiping from overview to all apps in 3 button mode Bug: 154761926 Change-Id: I155faec27f3b96e2f11aaec318d6846a893885e6 --- .../touchcontrollers/PortraitStatesTouchController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index cc3fd97b49..e5c9fc96ad 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -22,10 +22,12 @@ import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; import static com.android.launcher3.anim.Interpolators.LINEAR; +import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS; import static com.android.launcher3.config.FeatureFlags.UNSTABLE_SPRINGS; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS; +import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import android.animation.TimeInterpolator; @@ -132,7 +134,12 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr return TouchInteractionService.isConnected() ? mLauncher.getStateManager().getLastState() : NORMAL; } else if (fromState == OVERVIEW) { - return isDragTowardPositive ? ALL_APPS : NORMAL; + LauncherState positiveDragTarget = ALL_APPS; + if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(mLauncher)) { + // Don't allow swiping up to all apps. + positiveDragTarget = OVERVIEW; + } + return isDragTowardPositive ? positiveDragTarget : NORMAL; } else if (fromState == NORMAL && isDragTowardPositive) { int stateFlags = SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags(); return mAllowDragToOverview && TouchInteractionService.isConnected()