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

Commit c6df6eda authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Ensure that we're animating the current live tasks when going back"... 

Merge "Ensure that we're animating the current live tasks when going back" into tm-dev am: 3e6cd999 am: 1b7350f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18461390



Change-Id: Iee286ed20fe9529aa1efb19004a4448192980370
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8891aca5 1b7350f2

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class OverviewState extends LauncherState { 
    public void onBackPressed(Launcher launcher) {

        TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();

        if (taskView != null) {

            taskView.launchTaskAnimated();

            taskView.launchTasks();

        } else {

            super.onBackPressed(launcher);

        }

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

+74 −67
Original line number Diff line number Diff line
@@ -618,73 +618,7 @@ public class TaskView extends FrameLayout implements Reusable { 
        if (confirmSecondSplitSelectApp()) {

            return;

        }

        RecentsView recentsView = getRecentsView();

        RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;

        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask() && remoteTargetHandles != null) {

            if (!mIsClickableAsLiveTile) {

                return;

            }



            // Reset the minimized state since we force-toggled the minimized state when entering

            // overview, but never actually finished the recents animation

            SystemUiProxy.INSTANCE.get(getContext()).setSplitScreenMinimized(false);



            mIsClickableAsLiveTile = false;

            RemoteAnimationTargets targets;

            if (remoteTargetHandles.length == 1) {

                targets = remoteTargetHandles[0].getTransformParams().getTargetSet();

            } else {

                TransformParams topLeftParams = remoteTargetHandles[0].getTransformParams();

                TransformParams rightBottomParams = remoteTargetHandles[1].getTransformParams();

                RemoteAnimationTargetCompat[] apps = Stream.concat(

                        Arrays.stream(topLeftParams.getTargetSet().apps),

                        Arrays.stream(rightBottomParams.getTargetSet().apps))

                        .toArray(RemoteAnimationTargetCompat[]::new);

                RemoteAnimationTargetCompat[] wallpapers = Stream.concat(

                        Arrays.stream(topLeftParams.getTargetSet().wallpapers),

                        Arrays.stream(rightBottomParams.getTargetSet().wallpapers))

                        .toArray(RemoteAnimationTargetCompat[]::new);

                targets = new RemoteAnimationTargets(apps, wallpapers,

                        topLeftParams.getTargetSet().nonApps,

                        topLeftParams.getTargetSet().targetMode);

            }

            if (targets == null) {

                // If the recents animation is cancelled somehow between the parent if block and

                // here, try to launch the task as a non live tile task.

                launchTaskAnimated();

                mIsClickableAsLiveTile = true;

                return;

            }



            AnimatorSet anim = new AnimatorSet();

            TaskViewUtils.composeRecentsLaunchAnimator(

                    anim, this, targets.apps,

                    targets.wallpapers, targets.nonApps, true /* launcherClosing */,

                    mActivity.getStateManager(), recentsView,

                    recentsView.getDepthController());

            anim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationStart(Animator animation) {

                    recentsView.runActionOnRemoteHandles(

                            (Consumer<RemoteTargetHandle>) remoteTargetHandle ->

                                    remoteTargetHandle

                                            .getTaskViewSimulator()

                                            .setDrawsBelowRecents(false));

                }



                @Override

                public void onAnimationEnd(Animator animator) {

                    if (mTask != null && mTask.key.displayId != getRootViewDisplayId()) {

                        launchTaskAnimated();

                    }

                    mIsClickableAsLiveTile = true;

                }

            });

            anim.start();

            recentsView.onTaskLaunchedInLiveTileMode();

        } else {

            launchTaskAnimated();

        }

        launchTasks();

        mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())

                .log(LAUNCHER_TASK_LAUNCH_TAP);

    }
@@ -781,6 +715,79 @@ public class TaskView extends FrameLayout implements Reusable { 
        }

    }



    /**

     * Launch of the current task (both live and inactive tasks) with an animation.

     */

    public void launchTasks() {

        RecentsView recentsView = getRecentsView();

        RemoteTargetHandle[] remoteTargetHandles = recentsView.mRemoteTargetHandles;

        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask() && remoteTargetHandles != null) {

            if (!mIsClickableAsLiveTile) {

                return;

            }



            // Reset the minimized state since we force-toggled the minimized state when entering

            // overview, but never actually finished the recents animation

            SystemUiProxy.INSTANCE.get(getContext()).setSplitScreenMinimized(false);



            mIsClickableAsLiveTile = false;

            RemoteAnimationTargets targets;

            if (remoteTargetHandles.length == 1) {

                targets = remoteTargetHandles[0].getTransformParams().getTargetSet();

            } else {

                TransformParams topLeftParams = remoteTargetHandles[0].getTransformParams();

                TransformParams rightBottomParams = remoteTargetHandles[1].getTransformParams();

                RemoteAnimationTargetCompat[] apps = Stream.concat(

                        Arrays.stream(topLeftParams.getTargetSet().apps),

                        Arrays.stream(rightBottomParams.getTargetSet().apps))

                        .toArray(RemoteAnimationTargetCompat[]::new);

                RemoteAnimationTargetCompat[] wallpapers = Stream.concat(

                        Arrays.stream(topLeftParams.getTargetSet().wallpapers),

                        Arrays.stream(rightBottomParams.getTargetSet().wallpapers))

                        .toArray(RemoteAnimationTargetCompat[]::new);

                targets = new RemoteAnimationTargets(apps, wallpapers,

                        topLeftParams.getTargetSet().nonApps,

                        topLeftParams.getTargetSet().targetMode);

            }

            if (targets == null) {

                // If the recents animation is cancelled somehow between the parent if block and

                // here, try to launch the task as a non live tile task.

                launchTaskAnimated();

                mIsClickableAsLiveTile = true;

                return;

            }



            AnimatorSet anim = new AnimatorSet();

            TaskViewUtils.composeRecentsLaunchAnimator(

                    anim, this, targets.apps,

                    targets.wallpapers, targets.nonApps, true /* launcherClosing */,

                    mActivity.getStateManager(), recentsView,

                    recentsView.getDepthController());

            anim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationStart(Animator animation) {

                    recentsView.runActionOnRemoteHandles(

                            (Consumer<RemoteTargetHandle>) remoteTargetHandle ->

                                    remoteTargetHandle

                                            .getTaskViewSimulator()

                                            .setDrawsBelowRecents(false));

                }



                @Override

                public void onAnimationEnd(Animator animator) {

                    if (mTask != null && mTask.key.displayId != getRootViewDisplayId()) {

                        launchTaskAnimated();

                    }

                    mIsClickableAsLiveTile = true;

                }

            });

            anim.start();

            recentsView.onTaskLaunchedInLiveTileMode();

        } else {

            launchTaskAnimated();

        }

    }



    /**

     * See {@link TaskDataChanges}

     * @param visible If this task view will be visible to the user in overview or hidden