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

Commit 397fccc4 authored by Qijing Yao's avatar Qijing Yao
Browse files

Migrates Flags.enableConnectedDisplaysWindowDrag to use DesktopExperienceFlag 

Bug: 407921704
Test: atest WMShellUnitTests:DisplayControllerTests
Test: atest WMShellUnitTests:DesktopTasksControllerTest
Test: atest WMShellUnitTests:DesktopModeWindowDecorViewModelTests
Flag: EXEMPT - changing flag infra
Change-Id: I2972eb8f4a62137a210471225cb045df183677d8
parent 6913d000

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java

+3 −3
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ import android.view.Display; 
import android.view.IDisplayWindowListener;

import android.view.IWindowManager;

import android.view.InsetsState;

import android.window.DesktopExperienceFlags;

import android.window.WindowContainerTransaction;



import androidx.annotation.BinderThread;



import com.android.window.flags.Flags;

import com.android.wm.shell.common.DisplayChangeController.OnDisplayChangingListener;

import com.android.wm.shell.shared.annotations.ShellMainThread;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
@@ -93,7 +93,7 @@ public class DisplayController { 
                onDisplayAdded(displayIds[i]);

            }



            if (Flags.enableConnectedDisplaysWindowDrag()

            if (DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG.isTrue()

                    && DesktopModeStatus.canEnterDesktopMode(mContext)) {

                mDisplayManager.registerTopologyListener(mMainExecutor,

                        this::onDisplayTopologyChanged);
@@ -210,7 +210,7 @@ public class DisplayController { 
                    : mContext.createDisplayContext(display);

            final DisplayRecord record = new DisplayRecord(displayId);

            DisplayLayout displayLayout = new DisplayLayout(context, display);

            if (Flags.enableConnectedDisplaysWindowDrag()

            if (DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG.isTrue()

                    && mUnpopulatedDisplayBounds.containsKey(displayId)) {

                displayLayout.setGlobalBoundsDp(mUnpopulatedDisplayBounds.get(displayId));

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -3590,7 +3590,7 @@ class DesktopTasksController( 
                val newDisplayId = motionEvent.getDisplayId()

                val displayAreaInfo = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(newDisplayId)

                val isCrossDisplayDrag =

                    Flags.enableConnectedDisplaysWindowDrag() &&

                    DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG.isTrue() &&

                        newDisplayId != taskInfo.getDisplayId() &&

                        displayAreaInfo != null

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import android.view.SurfaceControl.Transaction; 
import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewRootImpl;

import android.window.DesktopExperienceFlags;

import android.window.DesktopModeFlags;

import android.window.TaskSnapshot;

import android.window.WindowContainerToken;
@@ -2130,7 +2131,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
                MultiDisplayDragMoveIndicatorController multiDisplayDragMoveIndicatorController) {

            final TaskPositioner taskPositioner = DesktopModeStatus.isVeiledResizeEnabled()

                    // TODO(b/383632995): Update when the flag is launched.

                    ? (Flags.enableConnectedDisplaysWindowDrag()

                    ? (DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG.isTrue()

                        ? new MultiDisplayVeiledResizeTaskPositioner(

                            taskOrganizer,

                            windowDecoration,