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

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

Merge "Track closing tasks so we don't inadvertently hide the leash" into... 

Merge "Track closing tasks so we don't inadvertently hide the leash" into udc-qpr-dev am: c1a17427

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24748333



Change-Id: I66f2925be7190a96c3e1d94d8671983cf743f43c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35815f3c c1a17427

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+24 −5
Original line number Diff line number Diff line
@@ -218,6 +218,13 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
         */

        private ArrayList<TaskState> mPausingTasks = null;



        /**

         * List of tasks were pausing but closed in a subsequent merged transition. If a

         * closing task is reopened, the leash is not initially hidden since it is already

         * visible.

         */

        private ArrayList<TaskState> mClosingTasks = null;



        /**

         * List of tasks that we are switching to. Upon finish, these will remain visible and

         * on top.
@@ -369,6 +376,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
            }

            mFinishTransaction = null;

            mPausingTasks = null;

            mClosingTasks = null;

            mOpeningTasks = null;

            mInfo = null;

            mTransition = null;
@@ -413,6 +421,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
            mFinishCB = finishCB;

            mFinishTransaction = finishT;

            mPausingTasks = new ArrayList<>();

            mClosingTasks = new ArrayList<>();

            mOpeningTasks = new ArrayList<>();

            mLeashMap = new ArrayMap<>();

            mKeyguardLocked = (info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0;
@@ -659,7 +668,10 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                    final TransitionInfo.Change change = closingTasks.get(i);

                    final int pausingIdx = TaskState.indexOf(mPausingTasks, change);

                    if (pausingIdx >= 0) {

                        mPausingTasks.remove(pausingIdx);

                        // We are closing the pausing task, but it is still visible and can be

                        // restart by another transition prior to this transition finishing

                        final TaskState closingTask = mPausingTasks.remove(pausingIdx);

                        mClosingTasks.add(closingTask);

                        didMergeThings = true;

                        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                                "  closing pausing taskId=%d", change.getTaskInfo().taskId);
@@ -695,7 +707,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                for (int i = 0; i < openingTasks.size(); ++i) {

                    final TransitionInfo.Change change = openingTasks.get(i);

                    final boolean isLeaf = openingTaskIsLeafs.get(i) == 1;

                    int pausingIdx = TaskState.indexOf(mPausingTasks, change);

                    final int closingIdx = TaskState.indexOf(mClosingTasks, change);

                    if (closingIdx >= 0) {

                        // Remove opening tasks from closing set

                        mClosingTasks.remove(closingIdx);

                    }

                    final int pausingIdx = TaskState.indexOf(mPausingTasks, change);

                    if (pausingIdx >= 0) {

                        // Something is showing/opening a previously-pausing app.

                        if (isLeaf) {
@@ -718,12 +735,14 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                        appearedTargets[nextTargetIdx++] = target;

                        // reparent into the original `mInfo` since that's where we are animating.

                        final int rootIdx = TransitionUtil.rootIndexFor(change, mInfo);

                        final boolean wasClosing = closingIdx >= 0;

                        t.reparent(target.leash, mInfo.getRoot(rootIdx).getLeash());

                        t.setLayer(target.leash, layer);

                        // Hide the animation leash, let listener show it.

                        t.hide(target.leash);

                        // Hide the animation leash if not already visible, let listener show it

                        t.setVisibility(target.leash, !wasClosing);

                        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                                "  opening new leaf taskId=%d", target.taskId);

                                "  opening new leaf taskId=%d wasClosing=%b",

                                target.taskId, wasClosing);

                        mOpeningTasks.add(new TaskState(change, target.leash));

                    } else {

                        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,