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

Commit 4f9643bc authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Add path to allow task to replace Pipped task without breaking split 

* StageCoordinator wasns't handling the case where one of the
splits goes into Pip but doesn't break the split
* We now preemptively guess that an enter transition will
occur when we get the transition that Pip's one of the split tasks
and opens another.
* This is done because Pipping a task out of split results in
2 manual transitions being created in MixedTransitionHelper and
running through StageCoordinator's startAnimation() call again

Bug: 326869501
Test: Repro steps in bug don't break split.
Regular split to pip still works

Change-Id: I2717b1e25d5ac84f77a7a7dc56cee51dcfa08683
parent f60f67dc

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/TransitionUtil.java

+6 −2
Original line number Diff line number Diff line
@@ -69,8 +69,12 @@ public class TransitionUtil { 


    /** Returns {@code true} if the transition is opening or closing mode. */

    public static boolean isOpenOrCloseMode(@TransitionInfo.TransitionMode int mode) {

        return mode == TRANSIT_OPEN || mode == TRANSIT_CLOSE

                || mode == TRANSIT_TO_FRONT || mode == TRANSIT_TO_BACK;

        return isOpeningMode(mode) || mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK;

    }



    /** Returns {@code true} if the transition is opening mode. */

    public static boolean isOpeningMode(@TransitionInfo.TransitionMode int mode) {

        return mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT;

    }



    /** Returns {@code true} if the transition has a display change. */

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+2 −1
Original line number Diff line number Diff line
@@ -854,7 +854,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        mPipUiEventLoggerLogger.log(uiEventEnum);



        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "onTaskAppeared: %s, state=%s", mTaskInfo.topActivity, mPipTransitionState);

                "onTaskAppeared: %s, state=%s, taskId=%s", mTaskInfo.topActivity,

                mPipTransitionState, mTaskInfo.taskId);

        if (mPipTransitionState.getInSwipePipToHomeTransition()) {

            if (!mWaitForFixedRotation) {

                onEndOfSwipePipToHomeTransition();

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+16 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPos 
import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN;

import static com.android.wm.shell.shared.TransitionUtil.isClosingType;

import static com.android.wm.shell.shared.TransitionUtil.isOpeningMode;

import static com.android.wm.shell.shared.TransitionUtil.isOpeningType;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_MAIN;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_SIDE;
@@ -67,6 +68,7 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON 
import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_SCREEN_LOCKED_SHOW_ON_TOP;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_UNKNOWN;

import static com.android.wm.shell.splitscreen.SplitScreenController.exitReasonToString;

import static com.android.wm.shell.transition.MixedTransitionHelper.getPipReplacingChange;

import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;

import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE;

import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_PAIR_OPEN;
@@ -2836,7 +2838,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mSplitLayout.setFreezeDividerWindow(false);

            final StageChangeRecord record = new StageChangeRecord();

            final int transitType = info.getType();

            boolean hasEnteringPip = false;

            TransitionInfo.Change pipChange = null;

            for (int iC = 0; iC < info.getChanges().size(); ++iC) {

                final TransitionInfo.Change change = info.getChanges().get(iC);

                if (change.getMode() == TRANSIT_CHANGE
@@ -2847,7 +2849,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                }



                if (mMixedHandler.isEnteringPip(change, transitType)) {

                    hasEnteringPip = true;

                    pipChange = change;

                }



                final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();
@@ -2899,9 +2901,19 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                }

            }



            if (hasEnteringPip) {

            if (pipChange != null) {

                TransitionInfo.Change pipReplacingChange = getPipReplacingChange(info, pipChange,

                        mMainStage.mRootTaskInfo.taskId, mSideStage.mRootTaskInfo.taskId,

                        getSplitItemStage(pipChange.getLastParent()));

                if (pipReplacingChange != null) {

                    // Set an enter transition for when startAnimation gets called again

                    mSplitTransitions.setEnterTransition(transition, /*remoteTransition*/ null,

                            TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE, /*resizeAnim*/ false);

                }



                mMixedHandler.animatePendingEnterPipFromSplit(transition, info,

                        startTransaction, finishTransaction, finishCallback);

                        startTransaction, finishTransaction, finishCallback,

                        pipReplacingChange != null);

                notifySplitAnimationFinished();

                return true;

            }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+6 −2
Original line number Diff line number Diff line
@@ -177,9 +177,11 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
    @Override

    @CallSuper

    public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo, SurfaceControl leash) {

        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTaskAppeared: task=%d taskParent=%d rootTask=%d",

        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTaskAppeared: taskId=%d taskParent=%d rootTask=%d "

                        + "taskActivity=%s",

                taskInfo.taskId, taskInfo.parentTaskId,

                mRootTaskInfo != null ? mRootTaskInfo.taskId : -1);

                mRootTaskInfo != null ? mRootTaskInfo.taskId : -1,

                taskInfo.baseActivity);

        if (mRootTaskInfo == null) {

            mRootLeash = leash;

            mRootTaskInfo = taskInfo;
@@ -213,6 +215,8 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
    @Override

    @CallSuper

    public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {

        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTaskInfoChanged: taskId=%d taskAct=%s",

                taskInfo.taskId, taskInfo.baseActivity);

        mWindowDecorViewModel.ifPresent(viewModel -> viewModel.onTaskInfoChanged(taskInfo));

        if (mRootTaskInfo.taskId == taskInfo.taskId) {

            // Inflates split decor view only when the root task is visible.

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+9 −3
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 
    private ActivityEmbeddingController mActivityEmbeddingController;



    abstract static class MixedTransition {

        /** Entering Pip from split, breaks split. */

        static final int TYPE_ENTER_PIP_FROM_SPLIT = 1;



        /** Both the display and split-state (enter/exit) is changing */
@@ -103,6 +104,9 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 
        /** Enter pip from one of the Activity Embedding windows. */

        static final int TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING = 9;



        /** Entering Pip from split, but replace the Pip stage instead of breaking split. */

        static final int TYPE_ENTER_PIP_REPLACE_FROM_SPLIT = 10;



        /** The default animation for this mixed transition. */

        static final int ANIM_TYPE_DEFAULT = 0;
@@ -484,9 +488,11 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 
    // TODO(b/287704263): Remove when split/mixed are reversed.

    public boolean animatePendingEnterPipFromSplit(IBinder transition, TransitionInfo info,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            Transitions.TransitionFinishCallback finishCallback) {

        final MixedTransition mixed = createDefaultMixedTransition(

                MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT, transition);

            Transitions.TransitionFinishCallback finishCallback, boolean replacingPip) {

        int type = replacingPip

                ? MixedTransition.TYPE_ENTER_PIP_REPLACE_FROM_SPLIT

                : MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT;

        final MixedTransition mixed = createDefaultMixedTransition(type, transition);

        mActiveTransitions.add(mixed);

        Transitions.TransitionFinishCallback callback = wct -> {

            mActiveTransitions.remove(mixed);