Merge "Add IDesktopMode multiple desktops APIs" into main

2 files changed, 13 insertions, 14 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
index f0a12e05a400..c63b5ed56f3e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
@@ -3014,6 +3014,14 @@ class DesktopTasksController(
             controller = null
         }
 
+        override fun createDesk(displayId: Int) {
+            // TODO: b/362720497 - Implement this API.
+        }
+
+        override fun activateDesk(deskId: Int, remoteTransition: RemoteTransition?) {
+            // TODO: b/362720497 - Implement this API.
+        }
+
         override fun showDesktopApps(displayId: Int, remoteTransition: RemoteTransition?) {
             executeRemoteCallWithTaskPermission(controller, "showDesktopApps") { c ->
                 c.showDesktopApps(displayId, remoteTransition)
@@ -3041,17 +3049,6 @@ class DesktopTasksController(
             )
         }
 
-        override fun getVisibleTaskCount(displayId: Int): Int {
-            val result = IntArray(1)
-            executeRemoteCallWithTaskPermission(
-                controller,
-                "visibleTaskCount",
-                { controller -> result[0] = controller.visibleTaskCount(displayId) },
-                /* blocking= */ true,
-            )
-            return result[0]
-        }
-
         override fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {
             executeRemoteCallWithTaskPermission(controller, "onDesktopSplitSelectAnimComplete") { c
                 ->
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl
index a135e4462150..44f7e16e98c3 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl
@@ -29,6 +29,11 @@ import com.android.wm.shell.desktopmode.IMoveToDesktopCallback;
  * Interface that is exposed to remote callers to manipulate desktop mode features.
  */
 interface IDesktopMode {
+    /** If possible, creates a new desk on the display whose ID is `displayId`. */
+    oneway void createDesk(int displayId);
+
+    /** Activates the desk whose ID is `deskId` on whatever display it currently exists on. */
+    oneway void activateDesk(int deskId, in RemoteTransition remoteTransition);
 
     /** Show apps on the desktop on the given display */
     void showDesktopApps(int displayId, in RemoteTransition remoteTransition);
@@ -48,9 +53,6 @@ interface IDesktopMode {
     oneway void showDesktopApp(int taskId, in @nullable RemoteTransition remoteTransition,
             in DesktopTaskToFrontReason toFrontReason);
 
-    /** Get count of visible desktop tasks on the given display */
-    int getVisibleTaskCount(int displayId);
-
     /** Perform cleanup transactions after the animation to split select is complete */
     oneway void onDesktopSplitSelectAnimComplete(in RunningTaskInfo taskInfo);