From a084041389198b1433e848e8da7f26496505b782 Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Mon, 19 Aug 2024 22:36:01 +0000 Subject: Revert "Do not dismiss split while exit PiP to full-screen" This reverts commit c056c7660b611c00ac272e20165aa9ee8dd0601d. Reason for revert: b/360253138 Change-Id: I34427aac21e5dde6e41f4dc7d1c53460c59ada7a --- .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 428cc9118900..723a53128bd0 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 @@ -693,6 +693,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, return; } + if (mSplitScreenOptional.isPresent()) { + // If pip activity will reparent to origin task case and if the origin task still + // under split root, apply exit split transaction to make it expand to fullscreen. + SplitScreenController split = mSplitScreenOptional.get(); + if (split.isTaskInSplitScreen(mTaskInfo.lastParentTaskIdBeforePip)) { + split.prepareExitSplitScreen(wct, split.getStageOfTask( + mTaskInfo.lastParentTaskIdBeforePip), + SplitScreenController.EXIT_REASON_APP_FINISHED); + } + } mPipTransitionController.startExitTransition(TRANSIT_EXIT_PIP, wct, destinationBounds); return; } -- cgit v1.2.3-59-g8ed1b