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

Commit a2731053 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Add new headers flags to teamfood" into tm-qpr-dev am: e373c68b am: f275f8d8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19377430



Change-Id: I7be5c31236623ada90e516a69642d9d25114cb20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6efb5328 f275f8d8

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class Flags { 
            new BooleanFlag(500, true);



    public static final BooleanFlag COMBINED_QS_HEADERS =

            new BooleanFlag(501, false);

            new BooleanFlag(501, false, true);



    public static final ResourceBooleanFlag PEOPLE_TILE =

            new ResourceBooleanFlag(502, R.bool.flag_conversations);
@@ -136,7 +136,7 @@ public class Flags { 
    @Deprecated

    public static final BooleanFlag NEW_FOOTER = new BooleanFlag(504, true);



    public static final BooleanFlag NEW_HEADER = new BooleanFlag(505, false);

    public static final BooleanFlag NEW_HEADER = new BooleanFlag(505, false, true);

    public static final ResourceBooleanFlag FULL_SCREEN_USER_SWITCHER =

            new ResourceBooleanFlag(506, R.bool.config_enableFullscreenUserSwitcher);