diff options
| author | 2023-06-06 02:18:34 +0000 | |
|---|---|---|
| committer | 2023-06-06 02:18:34 +0000 | |
| commit | a8d522035ee215b5280bd755bad4191be7545a70 (patch) | |
| tree | a4b378a12cf8804d292119c8f3c3ef39ff7f08fe | |
| parent | 5e9526b32021f00e83a3d8ba96fc636ffe342a7d (diff) | |
| parent | a2f5366fcdcec43d5df13c90a28c4ab63f9f90ad (diff) | |
Merge "Fix not auto pip after swipe split pair to home" into udc-dev am: 64d7bea916 am: a2f5366fcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23484433
Change-Id: Id2772cbee5730953f0bc7ab80069dae5825fea76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index b966d67548c7..7e82497d2c9c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -2919,7 +2919,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, } setSplitsVisible(false); - prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, finishWct); + finishWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + true /* reparentLeafTaskIfRelaunch */); logExit(EXIT_REASON_UNKNOWN); } |