commit | 6e3591469a62de14cb1d2d980a8781cec21e6a9c | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Wed Apr 11 16:58:10 2018 -0700 |
committer | Tony Wickham <twickham@google.com> | Wed Apr 11 16:58:10 2018 -0700 |
tree | 0563f1ccba9d8cf36199c788dfc388f04409424d | |
parent | e833bf3ef567a072cf26b0711085c1b8d6d89175 [diff] |
Don't allow swiping down from overview in fallback recents Bug: 77921295 Change-Id: I5a374bed865f03a715cb852e99c86c6e2e119273
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java index 012b545..9f21a95 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java
@@ -131,7 +131,9 @@ directionsToDetectScroll = SwipeDetector.DIRECTION_POSITIVE; mStartContainerType = ContainerType.HOTSEAT; } else if (mLauncher.isInState(OVERVIEW)) { - directionsToDetectScroll = SwipeDetector.DIRECTION_BOTH; + boolean canSwipeDownFromOverview = getTargetState(OVERVIEW, false) != OVERVIEW; + directionsToDetectScroll = canSwipeDownFromOverview ? SwipeDetector.DIRECTION_BOTH + : SwipeDetector.DIRECTION_POSITIVE; mStartContainerType = ContainerType.TASKSWITCHER; } else { return 0;