commit 0fac36e0ba8022dc3c5c47bfd76a68526b874cc0
author Pierre Barbier de Reuille <pbdr@google.com> Mon Mar 31 23:45:26 2025 +0100
committer Pierre Barbier de Reuille <pbdr@google.com> Tue Apr 08 08:26:58 2025 +0100
tree d26821025b260d590da9992087902554fa57f39f
parent e1d45bfe4f13728ebb0c908db2af99b4058da471

Stop using DesktopModeStatus in PiP

Bug: 395863348
Flag: EXEMPT (refactor)
Test: atest WMShellUnitTests
Change-Id: Ifc79de1144a6d281f17b9bab68e0fcc36665e2db

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java
index 729924a..160e277 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip2Module.java
@@ -58,7 +58,7 @@
 import com.android.wm.shell.pip2.phone.PipTransitionState;
 import com.android.wm.shell.pip2.phone.PipUiStateChangeController;
 import com.android.wm.shell.shared.annotations.ShellMainThread;
-import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
+import com.android.wm.shell.shared.desktopmode.DesktopState;
 import com.android.wm.shell.splitscreen.SplitScreenController;
 import com.android.wm.shell.sysui.ShellCommandHandler;
 import com.android.wm.shell.sysui.ShellController;
@@ -264,9 +264,9 @@
             Context context, ShellTaskOrganizer shellTaskOrganizer,
             Optional<DesktopTasksController> desktopTasksControllerOptional,
             Optional<DesktopUserRepositories> desktopUserRepositoriesOptional,
-            PipDesktopState pipDesktopState
+            PipDesktopState pipDesktopState, DesktopState desktopState
     ) {
-        if (DesktopModeStatus.canEnterDesktopMode(context)
+        if (desktopState.canEnterDesktopMode()
                 && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue()) {
             return Optional.of(
                     new DesktopPipTransitionController(shellTaskOrganizer,