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

Commit 8ed34355 authored by Merissa Mitchell's avatar Merissa Mitchell
Browse files

[PiP on CD] Use PipFlags.isPip2ExperimentEnabled in PipDesktopState 

instead of checking the PiP flag value directly. This ensures that
PipDesktopState#isConnectedDisplaysPipEnabled returns true if Pip2 flag
value is false, but PiP on DW flag is true.

Bug: 416341513
Test: Manual - verify that we can enter PiP on CD
Test: atest PipDesktopStateTest
Flag: com.android.window.flags.enable_connected_displays_pip
Change-Id: Ia5534f8d61ee18a2148f0ba08adeb15467511033
parent aaccbd95

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipDesktopState.kt

+4 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN 
import android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED

import android.window.DesktopExperienceFlags

import com.android.internal.protolog.ProtoLog

import com.android.wm.shell.Flags

import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.common.DisplayLayout

import com.android.wm.shell.desktopmode.DesktopUserRepositories
@@ -30,6 +29,7 @@ import com.android.wm.shell.recents.RecentsTransitionHandler 
import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.recents.RecentsTransitionStateListener.RecentsTransitionState

import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING

import com.android.wm.shell.shared.pip.PipFlags

import java.util.Optional



/** Helper class for PiP on Desktop Mode. */
@@ -72,11 +72,12 @@ class PipDesktopState( 
     * Returns whether PiP in Connected Displays is enabled by checking the following:

     * - PiP in Desktop Windowing is enabled

     * - PiP in Connected Displays flag is enabled

     * - PiP2 flag is enabled

     * - PiP2 is enabled

     */

    fun isConnectedDisplaysPipEnabled(): Boolean =

        isDesktopWindowingPipEnabled() &&

                DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_PIP.isTrue && Flags.enablePip2()

                DesktopExperienceFlags.ENABLE_CONNECTED_DISPLAYS_PIP.isTrue &&

                PipFlags.isPip2ExperimentEnabled



    /**

     * Returns whether dragging PiP in Connected Displays is enabled by checking the following:

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDesktopStateTest.kt

+1 −6
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import androidx.test.filters.SmallTest 
import com.android.window.flags.Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_PIP

import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP

import com.android.window.flags.Flags.FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS

import com.android.wm.shell.Flags.FLAG_ENABLE_PIP2

import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.desktopmode.DesktopRepository
@@ -99,10 +98,7 @@ class PipDesktopStateTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(

        FLAG_ENABLE_CONNECTED_DISPLAYS_PIP,

        FLAG_ENABLE_PIP2

    )

    @EnableFlags(FLAG_ENABLE_CONNECTED_DISPLAYS_PIP)

    fun isConnectedDisplaysPipEnabled_returnsTrue() {

        assertThat(pipDesktopState.isConnectedDisplaysPipEnabled()).isTrue()

    }
@@ -110,7 +106,6 @@ class PipDesktopStateTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        FLAG_ENABLE_CONNECTED_DISPLAYS_PIP,

        FLAG_ENABLE_PIP2,

        FLAG_ENABLE_DRAGGING_PIP_ACROSS_DISPLAYS

    )

    fun isDraggingPipAcrossDisplaysEnabled_returnsTrue() {