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

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

Disable LeftoverMinimizedTasksRemover... 

when back navigation flag is enabled, so users don't lose their
minimized apps in desktop.

Bug: 368317126
Test: atest DesktopTaskLimiterTest
Flag: com.android.window.flags.enable_desktop_windowing_back_navigation

Change-Id: I7de115decad387602594a21946d64e94175297a1
parent cec97c3c

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.SurfaceControl 
import android.view.WindowManager.TRANSIT_TO_BACK

import android.window.TransitionInfo

import android.window.WindowContainerTransaction

import android.window.flags.DesktopModeFlags

import androidx.annotation.VisibleForTesting

import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MINIMIZE_WINDOW

import com.android.internal.jank.InteractionJankMonitor
@@ -161,6 +162,8 @@ class DesktopTasksLimiter ( 
    @VisibleForTesting

    inner class LeftoverMinimizedTasksRemover : DesktopModeTaskRepository.ActiveTasksListener {

        override fun onActiveTasksChanged(displayId: Int) {

            // If back navigation is enabled, we shouldn't remove the leftover tasks

            if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) return

            val wct = WindowContainerTransaction()

            removeLeftoverMinimizedTasks(displayId, wct)

            shellTaskOrganizer.applyTransaction(wct)

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

+20 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.wm.shell.desktopmode 
import android.app.ActivityManager.RunningTaskInfo

import android.os.Binder

import android.os.Handler

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.SetFlagsRule

import android.testing.AndroidTestingRunner

import android.view.Display.DEFAULT_DISPLAY
@@ -33,6 +35,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn 
import com.android.dx.mockito.inline.extended.StaticMockitoSession

import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MINIMIZE_WINDOW

import com.android.internal.jank.InteractionJankMonitor

import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.common.ShellExecutor
@@ -243,6 +246,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    fun removeLeftoverMinimizedTasks_activeNonMinimizedTasksStillAround_doesNothing() {

        desktopTaskRepo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 1)

        desktopTaskRepo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 2)
@@ -256,6 +260,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    fun removeLeftoverMinimizedTasks_noMinimizedTasks_doesNothing() {

        val wct = WindowContainerTransaction()

        desktopTasksLimiter.leftoverMinimizedTasksRemover.removeLeftoverMinimizedTasks(
@@ -265,6 +270,7 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    fun removeLeftoverMinimizedTasks_onlyMinimizedTasksLeft_removesAllMinimizedTasks() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

        val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
@@ -282,6 +288,20 @@ class DesktopTasksLimiterTest : ShellTestCase() { 
        assertThat(wct.hierarchyOps[1].container).isEqualTo(task2.token.asBinder())

    }



    @Test

    @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    fun removeLeftoverMinimizedTasks_onlyMinimizedTasksLeft_backNavEnabled_doesNothing() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

        val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

        desktopTaskRepo.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task1.taskId)

        desktopTaskRepo.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId)



        val wct = WindowContainerTransaction()

        desktopTasksLimiter.leftoverMinimizedTasksRemover.onActiveTasksChanged(DEFAULT_DISPLAY)



        assertThat(wct.hierarchyOps).isEmpty()

    }



    @Test

    fun addAndGetMinimizeTaskChangesIfNeeded_tasksWithinLimit_noTaskMinimized() {

        (1..<MAX_TASK_LIMIT).forEach { _ -> setUpFreeformTask() }