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

Commit c6ec2bf8 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Allow other app enter PiP when exiting current one 

When there is an PiP window and another app supports PiP being present,
exiting PiP from one app should trigger the other one entering PiP.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/cSpUhLRkoyTUP73M5sXXWJ
Bug: 235877477
Test: Follow the reproduce step in bug, see video
Change-Id: Ic6c9f64885b53368b79060aa76894ea6685630c9
parent 57f5c6bc

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

+1 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        // Re-set the PIP bounds to none.

        mPipBoundsState.setBounds(new Rect());

        mPipUiEventLoggerLogger.setTaskInfo(null);

        mMainExecutor.executeDelayed(() -> mPipMenuController.detach(), 0);

        mPipMenuController.detach();

        mLeash = null;



        if (info.displayId != Display.DEFAULT_DISPLAY && mOnDisplayIdChangeCallback != null) {

services/core/java/com/android/server/wm/Task.java

+8 −0
Original line number Diff line number Diff line
@@ -4440,6 +4440,14 @@ class Task extends TaskFragment { 
            // transferring the transform on the leash to the task, reset this state once we're

            // moving out of pip

            setCanAffectSystemUiFlags(true);

            // Turn on userLeaveHint so other app can enter PiP mode.

            mTaskSupervisor.mUserLeaving = true;

            // Allow entering PiP from current top most activity when we are leaving PiP.

            final Task topFocused = mRootWindowContainer.getTopDisplayFocusedRootTask();

            if (topFocused != null) {

                final ActivityRecord ar = topFocused.getTopResumedActivity();

                enableEnterPipOnTaskSwitch(ar, null /* toFrontTask */, ar, null /* opts */);

            }

            mRootWindowContainer.notifyActivityPipModeChanged(this, null);

        }

        if (likelyResolvedMode == WINDOWING_MODE_PINNED) {