diff options
author | Tony Wickham <twickham@google.com> | 2016-09-08 14:20:48 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-09-08 14:20:48 -0700 |
commit | 946f85060af4a471b071705cb1a66e07e0363a5c (patch) | |
tree | 299e1e4048042e09398f38fb4919b90b13f1eb63 /src | |
parent | 285c76ddedadb6164f978fd23855d5168339aeb8 (diff) | |
download | android_packages_apps_Trebuchet-946f85060af4a471b071705cb1a66e07e0363a5c.tar.gz android_packages_apps_Trebuchet-946f85060af4a471b071705cb1a66e07e0363a5c.tar.bz2 android_packages_apps_Trebuchet-946f85060af4a471b071705cb1a66e07e0363a5c.zip |
Don't close all apps when touching deep shortcuts container.
Bug: 31373894
Change-Id: Ica1d0c2318e8f5d3e45196174c9b495a1c2515cd
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index a3786fa3f..13e23575f 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -52,7 +52,6 @@ import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.TintedDrawableSpan; import com.android.launcher3.keyboard.FocusedItemDecorator; -import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.ComponentKey; @@ -278,6 +277,12 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc 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) { |