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

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

Merge "Wallpaper and non-app targets are not necessary" into sc-dev

parents e70e6a3b 936f06e0

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
                    if (recentsView != null) {

                        RemoteAnimationTargetCompat[] apps = new RemoteAnimationTargetCompat[1];

                        apps[0] = appearedTaskTarget;

                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps);

                        recentsView.launchSideTaskInLiveTileMode(appearedTaskTarget.taskId, apps,

                                new RemoteAnimationTargetCompat[0] /* wallpaper */,

                                new RemoteAnimationTargetCompat[0] /* nonApps */);

                        return;

                    }

                }

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

+7 −7
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ import com.android.quickstep.RecentsAnimationController; 
import com.android.quickstep.RecentsAnimationTargets;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;

import com.android.quickstep.RemoteAnimationTargets;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.TaskOverlayFactory;

import com.android.quickstep.TaskThumbnailCache;
@@ -844,11 +845,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
    public void launchSideTaskInLiveTileModeForRestartedApp(int taskId) {

        if (mRunningTaskId != -1 && mRunningTaskId == taskId &&

                getLiveTileParams().getTargetSet().findTask(taskId) != null) {

            launchSideTaskInLiveTileMode(taskId, getLiveTileParams().getTargetSet().apps);

            RemoteAnimationTargets targets = getLiveTileParams().getTargetSet();

            launchSideTaskInLiveTileMode(taskId, targets.apps, targets.wallpapers, targets.nonApps);

        }

    }



    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps) {

    public void launchSideTaskInLiveTileMode(int taskId, RemoteAnimationTargetCompat[] apps,

            RemoteAnimationTargetCompat[] wallpaper, RemoteAnimationTargetCompat[] nonApps) {

        AnimatorSet anim = new AnimatorSet();

        TaskView taskView = getTaskView(taskId);

        if (taskView == null || !isTaskViewVisible(taskView)) {
@@ -877,11 +880,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                }

            });

        } else {

            TaskViewUtils.composeRecentsLaunchAnimator(

                    anim, taskView, apps,

                    mLiveTileParams.getTargetSet().wallpapers,

                    mLiveTileParams.getTargetSet().nonApps, true /* launcherClosing */,

                    mActivity.getStateManager(), this,

            TaskViewUtils.composeRecentsLaunchAnimator(anim, taskView, apps, wallpaper, nonApps,

                    true /* launcherClosing */, mActivity.getStateManager(), this,

                    getDepthController());

        }

        anim.start();