Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6ea9c0 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev am: 60d91d2d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24884879



Change-Id: Ie2e54a29c8f6399a5b64530cd19f35b1b65a1541
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24fa4027 60d91d2d

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+4 −0
Original line number Diff line number Diff line
@@ -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();