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

Commit 7b7e96b3 authored by Shuming Hao's avatar Shuming Hao
Browse files

Migrate enableNonDefaultDisplaySplit to use DesktopExperienceFlag 

Bug: 413737410
Test: manual
Flag: com.android.window.flags.enable_non_default_display_split
Change-Id: I7b5d78e89ccee8342353114dfae247ebe8fcd9ed
parent 03384957

core/java/android/window/DesktopExperienceFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ public enum DesktopExperienceFlags { 
    ENABLE_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX(

            Flags::nestedTasksWithIndependentBoundsBugfix, false,

            Flags.FLAG_NESTED_TASKS_WITH_INDEPENDENT_BOUNDS_BUGFIX),

    ENABLE_NON_DEFAULT_DISPLAY_SPLIT(Flags::enableNonDefaultDisplaySplit, true,

            Flags.FLAG_ENABLE_NON_DEFAULT_DISPLAY_SPLIT),

    ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS(

            Flags::enablePersistingDisplaySizeForConnectedDisplays, true,

            Flags.FLAG_ENABLE_PERSISTING_DISPLAY_SIZE_FOR_CONNECTED_DISPLAYS),

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+1 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ class DesktopTasksController( 
        }



        if (

            !Flags.enableNonDefaultDisplaySplit() ||

            !DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT.isTrue ||

                !DesktopExperienceFlags.ENABLE_MOVE_TO_NEXT_DISPLAY_SHORTCUT.isTrue

        ) {

            return

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

+4 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP 


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

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

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;
@@ -124,6 +123,7 @@ import android.view.RemoteAnimationTarget; 
import android.view.SurfaceControl;

import android.view.WindowManager;

import android.widget.Toast;

import android.window.DesktopExperienceFlags;

import android.window.DisplayAreaInfo;

import android.window.RemoteTransition;

import android.window.TransitionInfo;
@@ -861,7 +861,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        // split root to the default display if the app pair is clicked on default display.

        // TODO(b/393217881): cover more cases and extract this to a new method when split screen

        //  in connected display is fully supported.

        if (enableNonDefaultDisplaySplit()) {

        if (DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT.isTrue()) {

            DisplayAreaInfo displayAreaInfo = mRootTDAOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY);

            ActivityManager.RunningTaskInfo taskInfo1 = mTaskOrganizer.getRunningTaskInfo(taskId1);

            ActivityManager.RunningTaskInfo taskInfo2 = mTaskOrganizer.getRunningTaskInfo(taskId2);
@@ -1797,7 +1797,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        //  current displayId when multi split is supported.

        ActivityManager.RunningTaskInfo rootTaskInfo =

                mSplitMultiDisplayHelper.getDisplayRootTaskInfo(DEFAULT_DISPLAY);

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

        if (DesktopExperienceFlags.ENABLE_NON_DEFAULT_DISPLAY_SPLIT.isTrue()

                && rootTaskInfo.displayId != DEFAULT_DISPLAY) {

            DisplayAreaInfo displayAreaInfo = mRootTDAOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY);

            if (displayAreaInfo != null) {

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