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

Commit 505f9a95 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Finish recents animation when user long swipes to all apps." into ub-launcher3-master

parents aae3768c f1338054

quickstep/src/com/android/quickstep/LongSwipeHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS; 
import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.OVERVIEW;

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

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.quickstep.WindowTransformSwipeHandler.MAX_SWIPE_DURATION;

import static com.android.quickstep.WindowTransformSwipeHandler.MIN_OVERSHOOT_DURATION;
@@ -173,5 +174,9 @@ public class LongSwipeHelper { 
                0);



        callback.run();



        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && toAllApps) {

            rv.finishRecentsAnimation(true, null);

        }

    }

}

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

+5 −4
Original line number Diff line number Diff line
@@ -1585,7 +1585,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        mClipAnimationHelper = clipAnimationHelper;

    }



    public void finishRecentsAnimation(boolean toHome, Runnable onFinishComplete) {

    public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {

        if (mRecentsAnimationWrapper == null) {

            if (onFinishComplete != null) {

                onFinishComplete.run();
@@ -1593,10 +1593,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
            return;

        }



        mRecentsAnimationWrapper.finish(toHome, onFinishComplete);

        mRecentsAnimationWrapper.finish(toRecents, onFinishComplete);

    }



    public void takeScreenshotAndFinishRecentsAnimation(boolean toHome, Runnable onFinishComplete) {

    public void takeScreenshotAndFinishRecentsAnimation(boolean toRecents,

            Runnable onFinishComplete) {

        if (mRecentsAnimationWrapper == null || getRunningTaskView() == null) {

            if (onFinishComplete != null) {

                onFinishComplete.run();
@@ -1631,7 +1632,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
                        }



                        detach();

                        mRecentsAnimationWrapper.finish(toHome, () -> {

                        mRecentsAnimationWrapper.finish(toRecents, () -> {

                            onFinishComplete.run();

                            mRunningTaskId = -1;

                        });