diff options
| author | Tony Wickham <twickham@google.com> | 2016-09-16 18:47:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-16 18:47:48 +0000 |
| commit | f595f3de0fb166f5b4d43f885b63dccaaa9efd5b (patch) | |
| tree | d6e68d2e4f4711d3d06f85879cc79f1edbe96d28 /src | |
| parent | 2fdd8f75c307e87362d1a61eaeeaf77bd530266d (diff) | |
| parent | 946f85060af4a471b071705cb1a66e07e0363a5c (diff) | |
| download | android_packages_apps_Trebuchet-f595f3de0fb166f5b4d43f885b63dccaaa9efd5b.tar.gz android_packages_apps_Trebuchet-f595f3de0fb166f5b4d43f885b63dccaaa9efd5b.tar.bz2 android_packages_apps_Trebuchet-f595f3de0fb166f5b4d43f885b63dccaaa9efd5b.zip | |
Merge "Don't close all apps when touching deep shortcuts container." into ub-launcher3-calgary-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 0a71a69a7..290accb1e 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -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) { |