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

Commit 1c41f230 authored by Lingyu Feng's avatar Lingyu Feng
Browse files

Add a flag for "Include default display in topology" switch 

This switch will only be used in projected mode.

Bug: 407512389
Test: m
Flag: EXEMPT adding a flag
Change-Id: I45b44f471a9ae8381d238c81198eb8de5448483b
parent 11908b1a

core/java/android/window/DesktopExperienceFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.window;



import static com.android.server.display.feature.flags.Flags.FLAG_ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH;

import static com.android.server.display.feature.flags.Flags.FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT;

import static com.android.server.display.feature.flags.Flags.enableDisplayContentModeManagement;
@@ -67,6 +68,9 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_CONNECTED_DISPLAYS_WINDOW_DRAG),

    ENABLE_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION(Flags::defaultDeskWithoutWarmupMigration, false,

            Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION),

    ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH(

            com.android.server.display.feature.flags.Flags::enableDefaultDisplayInTopologySwitch,

            false, FLAG_ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH),

    ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS(

            Flags::enableDesktopAppHeaderStateChangeAnnouncements, false,

            Flags.FLAG_ENABLE_DESKTOP_APP_HEADER_STATE_CHANGE_ANNOUNCEMENTS),

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+10 −0
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ public class DisplayManagerFlags { 
            Flags::enableOnModeChangedVsyncPhaseOffset

    );



    private final FlagState mEnableDefaultDisplayInTopologySwitch = new FlagState(

            Flags.FLAG_ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH,

            DesktopExperienceFlags.ENABLE_DEFAULT_DISPLAY_IN_TOPOLOGY_SWITCH::isTrue

    );



    /**

     * @return {@code true} if 'port' is allowed in display layout configuration file.

     */
@@ -615,6 +620,10 @@ public class DisplayManagerFlags { 
        return mDispatchDisplayModeWithVsyncOffsets.isEnabled();

    }



    public boolean isDefaultDisplayInTopologySwitchEnabled() {

        return mEnableDefaultDisplayInTopologySwitch.isEnabled();

    }



    /**

     * dumps all flagstates

     * @param pw printWriter
@@ -673,6 +682,7 @@ public class DisplayManagerFlags { 
        pw.println(" " + mSeparateTimeouts);

        pw.println(" " + mDelayImplicitRrRegistrationUntilRrAccessed);

        pw.println(" " + mDispatchDisplayModeWithVsyncOffsets);

        pw.println(" " + mEnableDefaultDisplayInTopologySwitch);

    }



    private static class FlagState {

services/core/java/com/android/server/display/feature/display_flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -514,3 +514,13 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_default_display_in_topology_switch"

    namespace: "lse_desktop_experience"

    description: "Add a switch that allows the user to include the default display in display topology. This is only used for projected mode."

    bug: "407512389"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}