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

Commit 462c6040 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... 

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

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



Change-Id: I6ac5494be4956a031e2cd4152e918488faa5f903
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6439685 7a6ea9c0

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

+4 −0
Original line number Diff line number Diff line
@@ -720,6 +720,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mSplitLayout.setDivideRatio(snapPosition);

        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
@@ -767,6 +769,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mSplitLayout.setDivideRatio(snapPosition);

        updateWindowBounds(mSplitLayout, wct);

        wct.reorder(mRootTaskInfo.token, true);

        wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                false /* reparentLeafTaskIfRelaunch */);

        setRootForceTranslucent(false, wct);



        options1 = options1 != null ? options1 : new Bundle();