Don't close all apps when touching deep shortcuts container.

am: 946f85060a

Change-Id: I5966cc024c9ac1e60ebb4ded18df8430dbc68513
This commit is contained in:
Tony Wickham 2016-09-16 18:52:21 +00:00 committed by android-build-merger
commit c145b55afa
1 changed files with 6 additions and 0 deletions

View File

@ -278,6 +278,12 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
if (mAppsRecyclerView.getScrollBar().isNearThumb(point[0], point[1])) { if (mAppsRecyclerView.getScrollBar().isNearThumb(point[0], point[1])) {
return false; 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 // 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. // enough items to scroll, THEN it's okay for the container to be pulled down.
if (mAppsRecyclerView.getScrollBar().getThumbOffset().y <= 0) { if (mAppsRecyclerView.getScrollBar().getThumbOffset().y <= 0) {