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

Commit 6a6301c5 authored by Tony Wickham's avatar Tony Wickham
Browse files

Always return RecentsView to translation 0 on drag end 

After reaching overview, we let the user translate RecentsView
if they continue dragging around. But when they let go, we need
to return RecentsView to translation 0 since that's no longer
part of the state machine.

Change-Id: I30b51485339a3b6c3dd52bda113b1a05b6e885fa
parent 3e60577f

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+17 −16
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
        float velocityDp = dpiFromPx(velocity);

        boolean isFling = Math.abs(velocityDp) > 1;

        LauncherStateManager stateManager = mLauncher.getStateManager();

        if (isFling) {

            // When flinging, go back to home instead of overview.

        boolean goToHomeInsteadOfOverview = isFling;

        if (goToHomeInsteadOfOverview) {

            if (velocity > 0) {

                stateManager.goToState(NORMAL, true,

                        () -> onSwipeInteractionCompleted(NORMAL, Touch.FLING));
@@ -187,7 +187,7 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
                        () -> onSwipeInteractionCompleted(NORMAL, Touch.SWIPE)));

                anim.start();

            }

        } else {

        }

        if (mReachedOverview) {

            float distanceDp = dpiFromPx(Math.max(

                    Math.abs(mRecentsView.getTranslationX()),
@@ -199,8 +199,9 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
                    .translationY(0)

                    .setInterpolator(ACCEL_DEACCEL)

                    .setDuration(duration)

                        .withEndAction(this::maybeSwipeInteractionToOverviewComplete);

            }

                    .withEndAction(goToHomeInsteadOfOverview

                            ? null

                            : this::maybeSwipeInteractionToOverviewComplete);

        }

    }