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

Commit e491be83 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Migrate enableDisplayWindowingModeSwitching to DesktopExpFlags 

This is a pure migration.

Flag: com.android.window.flags.enable_display_windowing_mode_switching
Bug: 398095929
Test: m
Change-Id: I387db4e61558023e1a5f2bad394ed8245b263987
parent 44f1aa1f

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)