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

Commit c40448d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate enableDisplayWindowingModeSwitching to DesktopExpFlags" into main

parents 14019d5e e491be83

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

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERN 
import android.view.Display.DEFAULT_DISPLAY

import android.view.IWindowManager

import android.view.WindowManager.TRANSIT_CHANGE

import android.window.DesktopExperienceFlags

import android.window.WindowContainerTransaction

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags

import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.desktopmode.desktopwallpaperactivity.DesktopWallpaperActivityTokenProvider
@@ -47,7 +47,7 @@ class DesktopDisplayModeController( 
) {



    fun refreshDisplayWindowingMode() {

        if (!Flags.enableDisplayWindowingModeSwitching()) return

        if (!DesktopExperienceFlags.ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING.isTrue) return

        // TODO: b/375319538 - Replace the check with a DisplayManager API once it's available.

        val isExtendedDisplayEnabled =

            0 !=

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/OpenAppWithExternalDisplayConnected.kt

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.tools.Rotation 
import android.tools.flicker.rules.ChangeDisplayOrientationRule

import android.tools.traces.parsers.WindowManagerStateHelper

import android.util.DisplayMetrics

import android.window.DesktopExperienceFlags

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation
@@ -64,7 +65,7 @@ constructor(private val rotation: Rotation = Rotation.ROTATION_0) { 
    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        Assume.assumeTrue(Flags.enableDisplayWindowingModeSwitching())

        Assume.assumeTrue(DesktopExperienceFlags.ENABLE_DISPLAY_WINDOWING_MODE_SWITCHING.isTrue)

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        ChangeDisplayOrientationRule.setRotation(rotation)