commit c145b55afa7219facb2eb19354064bf2852140db
author Tony Wickham <twickham@google.com> Fri Sep 16 18:52:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 18:52:21 2016 +0000
tree 16b9c737f0f7e1fd143c006ef42f4b5746cd9d17
parent d9a7f8cc9d98b55d57b96944f8e3c8ed947fe7b6
parent 946f85060af4a471b071705cb1a66e07e0363a5c

Don't close all apps when touching deep shortcuts container.
am: 946f85060a

Change-Id: I5966cc024c9ac1e60ebb4ded18df8430dbc68513

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 0a71a69..290accb 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -278,6 +278,12 @@
         if (mAppsRecyclerView.getScrollBar().isNearThumb(point[0], point[1])) {
             return false;
         }
+
+        // IF a shortcuts container is open, container should not be pulled down.
+        if (mLauncher.getOpenShortcutsContainer() != 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().getThumbOffset().y <= 0) {