commit ffbb5444bba0398fa9a88dc6505f12d72adda37c
author Tony Wickham <twickham@google.com> Thu Apr 12 00:27:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 12 00:27:12 2018 +0000
tree 37d9916e5e422d0fdf49ef41a4a5fb8da37ad7bf
parent 7eff40ff2df3acea49aeba04dc78322a2b4b6208
parent 6e3591469a62de14cb1d2d980a8781cec21e6a9c

Merge "Don't allow swiping down from overview in fallback recents" into ub-launcher3-master

quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java

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;