diff options
| author | 2023-09-28 19:39:26 +0000 | |
|---|---|---|
| committer | 2023-09-28 19:39:26 +0000 | |
| commit | 7a6ea9c040e49a5c024c195925ee1861ec11f1cd (patch) | |
| tree | 88115bcc446ca95aa831cb130cdf331ce01c0c3f /libs | |
| parent | 24fa4027b521f0692f70c5d0c09d4cc830982c6a (diff) | |
| parent | 60d91d2d426f8793f2e625a4718274ac13852ebd (diff) | |
Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev am: 60d91d2d42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24884879
Change-Id: Ie2e54a29c8f6399a5b64530cd19f35b1b65a1541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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(); |