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

Commit b8afec82 authored by Min Chen's avatar Min Chen Committed by Android (Google) Code Review
Browse files

Merge "Use DesktopExperienceFlags for Flags.enableMultipleDesktopsFrontend" into main

parents e36a77d3 8208282f

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

+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);

    }

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

+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