diff options
| author | 2022-07-28 15:57:57 -0700 | |
|---|---|---|
| committer | 2022-08-01 12:38:29 -0700 | |
| commit | c6ec2bf886829ef9cef6ea3fb7f7e56f99bc7595 (patch) | |
| tree | 13355881e9f7fab022a7e39c7a4895c0dfb2bade | |
| parent | 57f5c6bcf165c2e51321b169d5e36bd5069532f4 (diff) | |
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
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 1155ea174ed1..e6bcbb530193 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -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) { diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 3b97e637a20a..5944c61567c3 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -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) { |