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

Commit 153edaa9 authored by Coco Duan's avatar Coco Duan Committed by Automerger Merge Worker
Browse files

Merge "Enable SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY and... 

Merge "Enable SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY and HIDE_SMARTSPACE_ON_DREAM_OVERLAY for Droidfood" into tm-qpr-dev am: ed33fcad

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



Change-Id: I9e19394a7f64bdd9f1e484eb16fd3de340cad3c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7b110ff ed33fcad

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

+2 −10
Original line number Diff line number Diff line
@@ -258,20 +258,12 @@ object Flags { 
    // TODO(b/270223352): Tracking Bug

    @JvmField

    val HIDE_SMARTSPACE_ON_DREAM_OVERLAY =

        unreleasedFlag(

            404,

            "hide_smartspace_on_dream_overlay",

            teamfood = true

    )

        releasedFlag(404, "hide_smartspace_on_dream_overlay")



    // TODO(b/271460958): Tracking Bug

    @JvmField

    val SHOW_WEATHER_COMPLICATION_ON_DREAM_OVERLAY =

        unreleasedFlag(

            405,

            "show_weather_complication_on_dream_overlay",

            teamfood = true

        )

        releasedFlag(405, "show_weather_complication_on_dream_overlay")



    // 500 - quick settings