Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3e02eba authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Don't let AllAppsTransitionController intercept when a floating view is... 

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

src/com/android/launcher3/allapps/AllAppsContainerView.java

+0 −5
Original line number Diff line number Diff line
@@ -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) {

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import android.view.animation.AccelerateInterpolator; 
import android.view.animation.DecelerateInterpolator;

import android.view.animation.Interpolator;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Hotseat;

import com.android.launcher3.Launcher;
@@ -24,6 +25,7 @@ import com.android.launcher3.LauncherAnimUtils; 
import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.Workspace;

import com.android.launcher3.shortcuts.DeepShortcutsContainer;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.util.TouchController;
@@ -118,6 +120,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul 
                mNoIntercept = true;

            } else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) {

                mNoIntercept = true;

            } else if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {

                mNoIntercept = true;

            } else {

                // Now figure out which direction scroll events the controller will start

                // calling the callbacks.