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

Commit 9884a121 authored by Coco Duan's avatar Coco Duan Committed by Automerger Merge Worker
Browse files

Merge "Enabled SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY for Teamfood" into... 

Merge "Enabled SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY for Teamfood" into tm-qpr-dev am: 3304d2f4 am: 7d00af24

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



Change-Id: I54452b51383723f45059b3bcc65397fd1dfa2176
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4161060b 7d00af24

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

+12 −3
Original line number Diff line number Diff line
@@ -236,12 +236,21 @@ object Flags { 


    // TODO(b/270223352): Tracking Bug

    @JvmField

    val HIDE_SMARTSPACE_ON_DREAM_OVERLAY = unreleasedFlag(404, "hide_smartspace_on_dream_overlay")

    val HIDE_SMARTSPACE_ON_DREAM_OVERLAY =

        unreleasedFlag(

            404,

            "hide_smartspace_on_dream_overlay",

            teamfood = true

    )



    // TODO(b/271460958): Tracking Bug

    @JvmField

    val SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY = unreleasedFlag(405,

        "show_weather_complication_on_dream_overlay")

    val SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY =

        unreleasedFlag(

            405,

            "show_weather_complication_on_dream_overlay",

            teamfood = true

        )



    // 500 - quick settings