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

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

Merge "Add Multi Instance flag to developer options." into main

parents b6494527 b1cd5a40

core/java/android/window/DesktopModeFlags.java

+3 −1
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ public enum DesktopModeFlags { 
        Flags::enableTopVisibleRootTaskPerUserTracking, true),

    ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX(

            Flags::enableDesktopRecentsTransitionsCornersBugfix, false),

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true);

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true),

    ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES(

        Flags::enableDesktopWindowingMultiInstanceFeatures, true);



    /**

     * Flag class, to be used in case the enum cannot be used because the flag is not accessible.

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        updateGenericLink();

        final boolean supportsMultiInstance = mMultiInstanceHelper

                .supportsMultiInstanceSplit(mTaskInfo.baseActivity, mTaskInfo.userId)

                && Flags.enableDesktopWindowingMultiInstanceFeatures();

                && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES.isTrue();

        final boolean shouldShowManageWindowsButton = supportsMultiInstance

                && mMinimumInstancesFound;

        final boolean shouldShowChangeAspectRatioButton = HandleMenu.Companion