From e2e953304f12452d29c4e506fe6997e419d85753 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 9 Apr 2019 12:23:01 -0700 Subject: [PATCH] Allow swipe up to all apps anywhere on workspace Bug: 129033091 Change-Id: Ib0066c59f86b3137aedad8d18393b5a622e0cd80 --- .../touchcontrollers/PortraitStatesTouchController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index ce50b680f3..0c29fcf5ab 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -44,7 +44,6 @@ import com.android.launcher3.anim.Interpolators; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SwipeDetector; import com.android.launcher3.uioverrides.states.OverviewState; -import com.android.launcher3.uioverrides.touchcontrollers.PortraitOverviewStateTouchHelper; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.quickstep.RecentsModel; @@ -114,8 +113,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr return false; } } else { + // If we are swiping to all apps instead of overview, allow it from anywhere. + boolean interceptAnywhere = mLauncher.isInState(NORMAL) && !mAllowDragToOverview; // For all other states, only listen if the event originated below the hotseat height - if (!isTouchOverHotseat(mLauncher, ev)) { + if (!interceptAnywhere && !isTouchOverHotseat(mLauncher, ev)) { return false; } }