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

Commit 8208282f authored by minch's avatar minch
Browse files

Use DesktopExperienceFlags for Flags.enableMultipleDesktopsFrontend

Bug: 407923725
Test: presubmit
Flag: com.android.window.flags.enable_multiple_desktops_frontend
Change-Id: I6a02ec964e13a6a440cac6d3b2fa3a5831c0f4dd
parent 75eab107
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class DesktopModeStatus {
     */
    public static boolean enableMultipleDesktops(@NonNull Context context) {
        return DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()
                && Flags.enableMultipleDesktopsFrontend()
                && DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue()
                && canEnterDesktopMode(context);
    }

+3 −3
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ class DesktopStateImpl(context: Context) : DesktopState {
        }

    override val enableMultipleDesktops: Boolean =
        DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue &&
            Flags.enableMultipleDesktopsFrontend() &&
            canEnterDesktopMode
        DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue
                && DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_FRONTEND.isTrue
                && canEnterDesktopMode

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