Merge "Allow swipe up to all apps anywhere on workspace" into ub-launcher3-qt-dev

am: 9edc8eb756

Change-Id: I3310a9aa0e8e0ad6568f780b25dbf7d4007531a4
This commit is contained in:
Tony Wickham
2019-04-09 13:07:11 -07:00
committed by android-build-merger
@@ -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;
}
}