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

Commit 9f8d79e2 authored by Shuming Hao's avatar Shuming Hao Committed by Android (Google) Code Review
Browse files

Merge "Reparent split root task to default display" into main

parents 86d35557 57c8f9d4

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

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; 
import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER;



import static com.android.window.flags.Flags.enableNonDefaultDisplaySplit;

import static com.android.wm.shell.Flags.enableFlexibleSplit;

import static com.android.wm.shell.Flags.enableFlexibleTwoAppSplit;

import static com.android.wm.shell.common.split.SplitLayout.PARALLAX_ALIGN_CENTER;
@@ -1697,6 +1698,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                wct.setWindowingMode(taskInfo.token, targetWindowingMode);

            });

        }

        // Reparent root task to default display if non default display split is enabled.

        if (enableNonDefaultDisplaySplit() && mRootTaskInfo.displayId != DEFAULT_DISPLAY) {

            DisplayAreaInfo displayAreaInfo = mRootTDAOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY);

            if (displayAreaInfo != null) {

                wct.reparent(mRootTaskInfo.token, displayAreaInfo.token, false /* onTop */);

            }

        }

        deactivateSplit(wct, stageToTop);

        mSplitState.exit();

    }