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

Commit 47e5e6fa authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove ability for Released or Resource flags to be "teamfood"." into udc-dev am: 48f69382 

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



Change-Id: I7cc9d6135a9b65831f3a77ba72b77d0927eb30a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2669f6c9 48f69382

packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt

+2 −4
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ object FlagsFactory { 
        id: Int,

        name: String,

        namespace: String = "systemui",

        teamfood: Boolean = false

    ): ReleasedFlag {

        val flag = ReleasedFlag(id = id, name = name, namespace = namespace, teamfood = teamfood)

        val flag = ReleasedFlag(id = id, name = name, namespace = namespace, teamfood = false)

        checkForDupesAndAdd(flag)

        return flag

    }
@@ -55,7 +54,6 @@ object FlagsFactory { 
        @BoolRes resourceId: Int,

        name: String,

        namespace: String = "systemui",

        teamfood: Boolean = false

    ): ResourceBooleanFlag {

        val flag =

            ResourceBooleanFlag(
@@ -63,7 +61,7 @@ object FlagsFactory { 
                name = name,

                namespace = namespace,

                resourceId = resourceId,

                teamfood = teamfood

                teamfood = false,

            )

        checkForDupesAndAdd(flag)

        return flag

packages/SystemUI/src-release/com/android/systemui/flags/FlagsFactory.kt

+2 −4
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ object FlagsFactory { 
        id: Int,

        name: String,

        namespace: String = "systemui",

        teamfood: Boolean = false

    ): ReleasedFlag {

        val flag = ReleasedFlag(id = id, name = name, namespace = namespace, teamfood = teamfood)

        val flag = ReleasedFlag(id = id, name = name, namespace = namespace, teamfood = false)

        flagMap[name] = flag

        return flag

    }
@@ -55,7 +54,6 @@ object FlagsFactory { 
        @BoolRes resourceId: Int,

        name: String,

        namespace: String = "systemui",

        teamfood: Boolean = false

    ): ResourceBooleanFlag {

        val flag =

            ResourceBooleanFlag(
@@ -63,7 +61,7 @@ object FlagsFactory { 
                name = name,

                namespace = namespace,

                resourceId = resourceId,

                teamfood = teamfood

                teamfood = false,

            )

        flagMap[name] = flag

        return flag

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

+6 −6
Original line number Diff line number Diff line
@@ -101,12 +101,12 @@ object Flags { 
        releasedFlag(174148361, "notification_inline_reply_animation")



    val FILTER_UNSEEN_NOTIFS_ON_KEYGUARD =

        releasedFlag(254647461, "filter_unseen_notifs_on_keyguard", teamfood = true)

        releasedFlag(254647461, "filter_unseen_notifs_on_keyguard")



    // TODO(b/263414400): Tracking Bug

    @JvmField

    val NOTIFICATION_ANIMATE_BIG_PICTURE =

        releasedFlag(120, "notification_animate_big_picture", teamfood = true)

        releasedFlag(120, "notification_animate_big_picture")



    @JvmField

    val ANIMATED_NOTIFICATION_SHADE_INSETS =
@@ -184,7 +184,7 @@ object Flags { 
    // flag for controlling auto pin confirmation and material u shapes in bouncer

    @JvmField

    val AUTO_PIN_CONFIRMATION =

        releasedFlag(224, "auto_pin_confirmation", "auto_pin_confirmation", teamfood = true)

        releasedFlag(224, "auto_pin_confirmation", "auto_pin_confirmation")



    // TODO(b/262859270): Tracking Bug

    @JvmField val FALSING_OFF_FOR_UNFOLDED = releasedFlag(225, "falsing_off_for_unfolded")
@@ -621,15 +621,15 @@ object Flags { 
    @JvmField val NOTE_TASKS = releasedFlag(1900, "keycode_flag")



    // 2000 - device controls

    @Keep @JvmField val USE_APP_PANELS = releasedFlag(2000, "use_app_panels", teamfood = true)

    @Keep @JvmField val USE_APP_PANELS = releasedFlag(2000, "use_app_panels")



    @JvmField

    val APP_PANELS_ALL_APPS_ALLOWED =

        releasedFlag(2001, "app_panels_all_apps_allowed", teamfood = true)

        releasedFlag(2001, "app_panels_all_apps_allowed")



    @JvmField

    val CONTROLS_MANAGEMENT_NEW_FLOWS =

        releasedFlag(2002, "controls_management_new_flows", teamfood = true)

        releasedFlag(2002, "controls_management_new_flows")



    // Enables removing app from Home control panel as a part of a new flow

    // TODO(b/269132640): Tracking Bug