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

Commit 2e3ca633 authored by Jorge Gil's avatar Jorge Gil
Browse files

[2/N] Desks: Add multi-desk data structures 

This change adds basic new data structures to prepare for multi-desk
support and renames some existing ones to better align with multi-desks:
1) Adds DesktopDisplay: contains all desks as a well as the active one
2) Renames DesktopTaskData to Desk

Also moves |desktopTaskDataByDisplayId| behind a DesktopData interface
to allow swapping the implementation with one that supports
multiple desks when the flag is enabled, and refactors all callsites to
use the interface instead.

Finally, adds some basic functions to DesktopRepository to create,
remove and mark a desk as active.

Flag: com.android.window.flags.enable_multiple_desktops_backend
Bug: 389960283
Test: with flag disabled, no changes
Test: atest WMShellUnitTests
Change-Id: I64383b25af627d78762dbd375b87480e8da2bc21
parent df5ec06d

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

+579 −149

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -2162,7 +2162,7 @@ class DesktopTasksController( 
    fun removeDesktop(displayId: Int) {

        if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) return



        val tasksToRemove = taskRepository.removeDesktop(displayId)

        val tasksToRemove = taskRepository.removeDesk(displayId)

        val wct = WindowContainerTransaction()

        tasksToRemove.forEach {

            val task = shellTaskOrganizer.getRunningTaskInfo(it)

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -1046,14 +1046,14 @@ class DesktopRepositoryTest : ShellTestCase() { 
    }



    @Test

    fun removeDesktop_multipleTasks_removesAll() {

    fun removeDesk_multipleTasks_removesAll() {

        // The front-most task will be the one added last through `addTask`.

        repo.addTask(displayId = DEFAULT_DISPLAY, taskId = 3, isVisible = true)

        repo.addTask(displayId = DEFAULT_DISPLAY, taskId = 2, isVisible = true)

        repo.addTask(displayId = DEFAULT_DISPLAY, taskId = 1, isVisible = true)

        repo.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = 2)



        val tasksBeforeRemoval = repo.removeDesktop(displayId = DEFAULT_DISPLAY)

        val tasksBeforeRemoval = repo.removeDesk(displayId = DEFAULT_DISPLAY)



        assertThat(tasksBeforeRemoval).containsExactly(1, 2, 3).inOrder()

        assertThat(repo.getActiveTasks(displayId = DEFAULT_DISPLAY)).isEmpty()