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

Commit f6ac1a1c authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Do not start Pip transition when desktop windowing pip flag is off 

The transition is not handled if the flag is off. It makes the minimize
button not work for apps with auto-enter Pip.

Bug: 400635308
Flag: EXEMPT - bug fix
Test: WMShellUnitTest
Change-Id: I903cef735069e81412f51d92075939fe1b994ac8
parent 37b2bbff

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

+3 −1
Original line number Diff line number Diff line
@@ -763,7 +763,9 @@ class DesktopTasksController( 
    fun minimizeTask(taskInfo: RunningTaskInfo, minimizeReason: MinimizeReason) {

        val wct = WindowContainerTransaction()



        val isMinimizingToPip = taskInfo.pictureInPictureParams?.isAutoEnterEnabled() ?: false

        val isMinimizingToPip =

            DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue &&

                (taskInfo.pictureInPictureParams?.isAutoEnterEnabled() ?: false)

        // If task is going to PiP, start a PiP transition instead of a minimize transition

        if (isMinimizingToPip) {

            val requestInfo =