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

Commit 25133aa6 authored May 09, 2025 by minch

Introduce isMultipleDesktopFrontendEnabledOnDisplay

Only show the frontend UI on the display if it is supported.

Bug: 415367809
Test: Tested desktop mode is disabled in the pixel 9 but enabled
      in the connected display
Flag: com.android.window.flags.enable_multiple_desktops_frontend
Flag: com.android.window.flags.enable_multiple_desktops_backend
Change-Id: Ice376b7a84deb44ef8723efb2277083c7ca97600

parent 0d188614

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,16 @@ public class DesktopModeStatus {
		return false;
		}

		/**
		* Returns true if the multi-desks frontend should be enabled on the display.
		*/
		public static boolean isMultipleDesktopFrontendEnabledOnDisplay(@NonNull Context context,
		Display display) {
		return DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue()
		&& DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()
		&& isDesktopModeSupportedOnDisplay(context, display);
		}

		/**
		* Returns whether the multiple desktops feature is enabled for this device (both backend and
		* frontend implementations).

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,16 @@ interface DesktopState {
		@get:JvmName("enableMultipleDesktops")
		val enableMultipleDesktops: Boolean

		/**
		* Returns true if the multi-desks frontend should be enabled on the display.
		*/
		fun isMultipleDesktopFrontendEnabledOnDisplay(display: Display): Boolean

		/**
		* Returns true if the multi-desks frontend should be enabled on the display with [displayId].
		*/
		fun isMultipleDesktopFrontendEnabledOnDisplay(displayId: Int): Boolean

		/**
		* Checks if the display with id [displayId] should have desktop mode enabled or not. Internal
		* and external displays have separate logic.

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,15 @@ class DesktopStateImpl(context: Context) : DesktopState {
		&& DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue
		&& canEnterDesktopMode

		override fun isMultipleDesktopFrontendEnabledOnDisplay(display: Display): Boolean =
		DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue
		&& DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue
		&& isDesktopModeSupportedOnDisplay(display)

		override fun isMultipleDesktopFrontendEnabledOnDisplay(displayId: Int): Boolean =
		displayManager.getDisplay(displayId)?.let { isMultipleDesktopFrontendEnabledOnDisplay(it) }
		?: false

		override fun isDesktopModeSupportedOnDisplay(displayId: Int): Boolean =
		displayManager.getDisplay(displayId)?.let { isDesktopModeSupportedOnDisplay(it) } ?: false

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,12 @@ class FakeDesktopState : DesktopState {
		/** Override [canEnterDesktopMode] for a specific display. */
		val overrideDesktopModeSupportPerDisplay = mutableMapOf<Int, Boolean>()

		override fun isMultipleDesktopFrontendEnabledOnDisplay(display: Display): Boolean =
		enableMultipleDesktops && isDesktopModeSupportedOnDisplay(display)

		override fun isMultipleDesktopFrontendEnabledOnDisplay(displayId: Int): Boolean =
		enableMultipleDesktops && isDesktopModeSupportedOnDisplay(displayId)

		/**
		* This implementation returns [canEnterDesktopMode] unless overridden in
		* [overrideDesktopModeSupportPerDisplay].