Merge "Don't let AllAppsTransitionController intercept when a floating view is open." into ub-launcher3-master

This commit is contained in:
Tony Wickham
2016-12-14 05:06:08 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 5 deletions

View File

@@ -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) {