diff options
| author | 2023-09-28 18:19:24 +0000 | |
|---|---|---|
| committer | 2023-09-28 18:19:24 +0000 | |
| commit | 60d91d2d426f8793f2e625a4718274ac13852ebd (patch) | |
| tree | 4f1a88a5876b3b9c65f7f1142e4fe4a9cf8e1d9e | |
| parent | f6905f1cf9ca4f0d8b481a27daf1969cc56f29b5 (diff) | |
| parent | abe2307d78df88dc43cbc4431eee483e5e7a8235 (diff) | |
Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 4 |
1 files changed, 4 insertions, 0 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 8efdfd6ca1e1..3b1801b8d821 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 @@ -718,6 +718,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSplitLayout.setDivideRatio(splitRatio); updateWindowBounds(mSplitLayout, wct); wct.reorder(mRootTaskInfo.token, true); + wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + false /* reparentLeafTaskIfRelaunch */); setRootForceTranslucent(false, wct); // Make sure the launch options will put tasks in the corresponding split roots @@ -765,6 +767,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSplitLayout.setDivideRatio(splitRatio); updateWindowBounds(mSplitLayout, wct); wct.reorder(mRootTaskInfo.token, true); + wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + false /* reparentLeafTaskIfRelaunch */); setRootForceTranslucent(false, wct); options1 = options1 != null ? options1 : new Bundle(); |