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

Commit a066e443 authored by Tony Wickham's avatar Tony Wickham
Browse files

Re-enable quick scrub/switch from launcher 

When we get the onQuickScrubStart() or onQuickSwitch() callbacks, we go
to the overview state with a quicker duration (the same used from apps).
Then we follow the same logic as starting quick scrub/switch from apps
except that we allow you to scrub back to the workspace card.

Bug: 70180755
Change-Id: Iebcdcc4c4ad1e1210e2d1c11e5007c27d3c1eef3
parent 62388bec

quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java

+2 −9
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public class NavBarSwipeInteractionHandler extends BaseSwipeInteractionHandler i 


    private static final long MAX_SWIPE_DURATION = 200;

    private static final long MIN_SWIPE_DURATION = 80;

    private static final int QUICK_SWITCH_SNAP_DURATION = 120;



    // Ideal velocity for a smooth transition

    private static final float PIXEL_PER_MS = 2f;
@@ -369,14 +368,8 @@ public class NavBarSwipeInteractionHandler extends BaseSwipeInteractionHandler i 
            ((TaskView) currentRecentsPage).animateIconToScale(1f);

        }

        if (mInteractionType == INTERACTION_QUICK_SWITCH) {

            for (int i = mRecentsView.getFirstTaskIndex(); i < mRecentsView.getPageCount(); i++) {

                TaskView taskView = (TaskView) mRecentsView.getPageAt(i);

                if (taskView.getTask().key.id != mRunningTaskId) {

                    mRecentsView.snapToPage(i, QUICK_SWITCH_SNAP_DURATION);

                    taskView.postDelayed(() -> {taskView.launchTask(true);},

                            QUICK_SWITCH_SNAP_DURATION);

                    break;

                }

            if (mQuickScrubController != null) {

                mQuickScrubController.onQuickSwitch();

            }

        } else if (mInteractionType == INTERACTION_QUICK_SCRUB) {

            if (mQuickScrubController != null) {

quickstep/src/com/android/quickstep/QuickScrubController.java

+22 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.quickstep; 
import android.view.HapticFeedbackConstants;



import com.android.launcher3.Alarm;

import com.android.launcher3.Launcher;

import com.android.launcher3.OnAlarmListener;



/**
@@ -30,26 +29,27 @@ import com.android.launcher3.OnAlarmListener; 
 */

public class QuickScrubController implements OnAlarmListener {



    public static final int QUICK_SWITCH_START_DURATION = 133;

    public static final int QUICK_SWITCH_SNAP_DURATION = 120;



    private static final int NUM_QUICK_SCRUB_SECTIONS = 5;

    private static final long AUTO_ADVANCE_DELAY = 500;

    private static final int QUICKSCRUB_SNAP_DURATION_PER_PAGE = 325;

    private static final int QUICKSCRUB_END_SNAP_DURATION_PER_PAGE = 60;



    private Launcher mLauncher;

    private Alarm mAutoAdvanceAlarm;

    private RecentsView mRecentsView;



    private int mQuickScrubSection;

    private int mStartPage;



    public QuickScrubController(Launcher launcher) {

        mLauncher = launcher;

    public QuickScrubController(RecentsView recentsView) {

        mRecentsView = recentsView;

        mAutoAdvanceAlarm = new Alarm();

        mAutoAdvanceAlarm.setOnAlarmListener(this);

    }



    public void onQuickScrubStart(boolean startingFromHome) {

        mRecentsView = mLauncher.getOverviewPanel();

        mStartPage = startingFromHome ? 0 : mRecentsView.getFirstTaskIndex();

        mQuickScrubSection = 0;

    }
@@ -92,6 +92,23 @@ public class QuickScrubController implements OnAlarmListener { 
        }

    }



    public void onQuickSwitch() {

        for (int i = mRecentsView.getFirstTaskIndex(); i < mRecentsView.getPageCount(); i++) {

            TaskView taskView = (TaskView) mRecentsView.getPageAt(i);

            if (taskView.getTask().key.id != mRecentsView.getRunningTaskId()) {

                Runnable launchTaskRunnable = () -> taskView.launchTask(true);

                if (mRecentsView.snapToPage(i, QUICK_SWITCH_SNAP_DURATION)) {

                    // Snap to the new page then launch it

                    mRecentsView.setNextPageSwitchRunnable(launchTaskRunnable);

                } else {

                    // No need to move page, just launch task directly

                    launchTaskRunnable.run();

                }

                break;

            }

        }

    }



    public void snapToPageForCurrentQuickScrubSection() {

        goToPageWithHaptic(mRecentsView.getFirstTaskIndex() + mQuickScrubSection);

    }

quickstep/src/com/android/quickstep/RecentsView.java

+5 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class RecentsView extends PagedView implements Insettable { 
        setClipToOutline(true);



        mLauncher = Launcher.getLauncher(context);

        mQuickScrubController = new QuickScrubController(mLauncher);

        mQuickScrubController = new QuickScrubController(this);

        mModel = RecentsModel.getInstance(context);



        mScrollState.isRtl = mIsRtl;
@@ -431,6 +431,10 @@ public class RecentsView extends PagedView implements Insettable { 
        return getChildCount() - mFirstTaskIndex;

    }



    public int getRunningTaskId() {

        return mRunningTaskId;

    }



    /**

     * Reloads the view if anything in recents changed.

     */

quickstep/src/com/android/quickstep/TouchInteractionService.java

+36 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.ViewConfiguration; 


import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherState;

import com.android.launcher3.MainThreadExecutor;

import com.android.launcher3.model.ModelPreload;

import com.android.launcher3.R;
@@ -218,21 +219,27 @@ public class TouchInteractionService extends Service { 
        if (!target.getWindowId().isFocused()) {

            return mNoOpTouchConsumer;

        }

        return new LauncherTouchConsumer(target);

        return new LauncherTouchConsumer(launcher, target);

    }



    private class LauncherTouchConsumer implements TouchConsumer {



        private final Launcher mLauncher;

        private final View mTarget;

        private final int[] mLocationOnScreen = new int[2];

        private final PointF mDownPos = new PointF();

        private final int mTouchSlop;

        private final QuickScrubController mQuickScrubController;



        private boolean mTrackingStarted = false;



        LauncherTouchConsumer(View target) {

        LauncherTouchConsumer(Launcher launcher, View target) {

            mLauncher = launcher;

            mTarget = target;

            mTouchSlop = ViewConfiguration.get(mTarget.getContext()).getScaledTouchSlop();



            mQuickScrubController = mLauncher.<RecentsView>getOverviewPanel()

                    .getQuickScrubController();

        }



        @Override
@@ -282,6 +289,33 @@ public class TouchInteractionService extends Service { 
            ev.offsetLocation(mLocationOnScreen[0], mLocationOnScreen[1]);

            ev.setEdgeFlags(flags);

        }



        @Override

        public void updateTouchTracking(int interactionType) {

            mMainThreadExecutor.execute(() -> {

                if (TouchConsumer.isInteractionQuick(interactionType)) {

                    Runnable onComplete = null;

                    if (interactionType == INTERACTION_QUICK_SCRUB) {

                        mQuickScrubController.onQuickScrubStart(true);

                    } else if (interactionType == INTERACTION_QUICK_SWITCH) {

                        onComplete = mQuickScrubController::onQuickSwitch;

                    }

                    mLauncher.getStateManager().goToState(LauncherState.OVERVIEW, true, 0,

                            QuickScrubController.QUICK_SWITCH_START_DURATION, onComplete);

                }

            });

        }



        @Override

        public void onQuickScrubEnd() {

            mMainThreadExecutor.execute(mQuickScrubController::onQuickScrubEnd);

        }



        @Override

        public void onQuickScrubProgress(float progress) {

            mMainThreadExecutor.execute(() -> mQuickScrubController.onQuickScrubProgress(progress));

        }



    }



    private void initBackgroundChoreographer() {

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+4 −25
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.quickstep; 
import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.QuickScrubController.QUICK_SWITCH_START_DURATION;

import static com.android.quickstep.TouchConsumer.INTERACTION_NORMAL;

import static com.android.quickstep.TouchConsumer.INTERACTION_QUICK_SCRUB;

import static com.android.quickstep.TouchConsumer.INTERACTION_QUICK_SWITCH;
@@ -105,8 +106,6 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 


    private static final long MAX_SWIPE_DURATION = 200;

    private static final long MIN_SWIPE_DURATION = 80;

    private static final int QUICK_SWITCH_START_DURATION = 133;

    private static final int QUICK_SWITCH_SNAP_DURATION = 120;



    private static final float MIN_PROGRESS_FOR_OVERVIEW = 0.5f;
@@ -161,7 +160,6 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 
    private boolean mGestureStarted;



    private @InteractionType int mInteractionType = INTERACTION_NORMAL;

    private boolean mStartedQuickScrubFromHome;

    private boolean mDeferredQuickScrubEnd;



    private final RecentsAnimationWrapper mRecentsAnimationWrapper = new RecentsAnimationWrapper();
@@ -379,14 +377,10 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 
    }



    private void updateUiForQuickScrub() {

        mStartedQuickScrubFromHome = mWasLauncherAlreadyVisible;

        mDeferredQuickScrubEnd = false;

        mQuickScrubController = mRecentsView.getQuickScrubController();

        mQuickScrubController.onQuickScrubStart(mStartedQuickScrubFromHome);

        mQuickScrubController.onQuickScrubStart(false);

        animateToProgress(1f, QUICK_SWITCH_START_DURATION);

        if (mStartedQuickScrubFromHome) {

            mLauncherLayoutListener.setVisibility(View.INVISIBLE);

        }

    }



    @WorkerThread
@@ -431,10 +425,6 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 


    @WorkerThread

    private void updateFinalShift() {

        if (mStartedQuickScrubFromHome) {

            return;

        }



        float shift = mCurrentShift.value;



        synchronized (mRecentsAnimationWrapper) {
@@ -642,19 +632,8 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 
        mRecentsAnimationWrapper.finish(true /* toHome */);



        if (mInteractionType == INTERACTION_QUICK_SWITCH) {

            for (int i = mRecentsView.getFirstTaskIndex(); i < mRecentsView.getPageCount(); i++) {

                TaskView taskView = (TaskView) mRecentsView.getPageAt(i);

                if (taskView.getTask().key.id != mRunningTaskId) {

                    Runnable launchTaskRunnable = () -> taskView.launchTask(true);

                    if (mRecentsView.snapToPage(i, QUICK_SWITCH_SNAP_DURATION)) {

                        // Snap to the new page then launch it

                        mRecentsView.setNextPageSwitchRunnable(launchTaskRunnable);

                    } else {

                        // No need to move page, just launch task directly

                        launchTaskRunnable.run();

                    }

                    break;

                }

            if (mQuickScrubController != null) {

                mQuickScrubController.onQuickSwitch();

            }

        } else if (mInteractionType == INTERACTION_QUICK_SCRUB) {

            if (mQuickScrubController != null) {