diff options
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 5fc1d972c..6650abad5 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -208,11 +208,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc return false; } - // IF a shortcuts container is open, container should not be pulled down. - if (DeepShortcutsContainer.getOpen(mLauncher) != null) { - return false; - } - // IF scroller is at the very top OR there is no scroll bar because there is probably not // enough items to scroll, THEN it's okay for the container to be pulled down. if (mAppsRecyclerView.getScrollBar().getThumbOffsetY() <= 0) { diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index adfad0813..8ab4a619b 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -17,6 +17,7 @@ import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; +import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Hotseat; import com.android.launcher3.Launcher; @@ -24,6 +25,7 @@ import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; +import com.android.launcher3.shortcuts.DeepShortcutsContainer; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.util.TouchController; @@ -118,6 +120,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mNoIntercept = true; } else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) { mNoIntercept = true; + } else if (AbstractFloatingView.getTopOpenView(mLauncher) != null) { + mNoIntercept = true; } else { // Now figure out which direction scroll events the controller will start // calling the callbacks. |