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

Commit 60d91d2d authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev

parents f6905f1c abe2307d

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();