Merge "Don't close all apps when touching deep shortcuts container." into ub-launcher3-calgary-polish

This commit is contained in:
Tony Wickham
2016-09-16 18:47:48 +00:00
committed by Android (Google) Code Review

View File

@@ -278,6 +278,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) {