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

Commit bb8eb2aa authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Refactor to follow kotlin style 

Bug: 341753779
Flag: EXEMPT Refactor
Test: atest DesktopTasksController
Change-Id: I671fac210ec16118c15e5ef8e75d8ffbbf0c6771
parent d7e6d1b0

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

+3 −3
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ class DesktopTasksController( 
        )

        val wct = WindowContainerTransaction()

        exitSplitIfApplicable(wct, taskInfo)

        moveHomeTask(wct, true /* toTop */)

        moveHomeTask(wct, toTop = true)

        val taskToMinimize =

            bringDesktopAppsToFrontBeforeShowingNewTask(taskInfo.displayId, wct, taskInfo.taskId)

        addMoveToDesktopChanges(wct, taskInfo)
@@ -795,7 +795,7 @@ class DesktopTasksController( 
            addWallpaperActivity(wct)

        } else {

            // Move home to front

            moveHomeTask(wct, true /* toTop */)

            moveHomeTask(wct, toTop = true)

        }



        val nonMinimizedTasksOrderedFrontToBack =
@@ -1042,7 +1042,7 @@ class DesktopTasksController( 
                addMoveToDesktopChanges(wct, task)

                // In some launches home task is moved behind new task being launched. Make sure

                // that's not the case for launches in desktop.

                moveHomeTask(wct, false /* toTop */)

                moveHomeTask(wct, toTop = false)

                // Desktop Mode is already showing and we're launching a new Task - we might need to

                // minimize another Task.

                val taskToMinimize = addAndGetMinimizeChangesIfNeeded(task.displayId, wct, task)

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

+4 −2
Original line number Diff line number Diff line
@@ -1093,10 +1093,12 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    val fullscreenTask = createFullscreenTask()



    val wct = controller.handleRequest(Binder(), createTransition(fullscreenTask))

    assertThat(wct?.changes?.get(fullscreenTask.token.asBinder())?.windowingMode)



    assertNotNull(wct, "should handle request")

    assertThat(wct.changes[fullscreenTask.token.asBinder()]?.windowingMode)

        .isEqualTo(WINDOWING_MODE_FREEFORM)



    assertThat(wct!!.hierarchyOps.size).isEqualTo(2)

    assertThat(wct.hierarchyOps).hasSize(2)

    wct.assertReorderAt(1, homeTask, toTop = false)

  }