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

Commit 7e05c22b 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 am: 153edaa9 am: a14cb285 am: ce63ffc9

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



Change-Id: I81cc2b62aeb880ec3168e5d2bb8667277312cc8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18bdc812 ce63ffc9
Loading
Loading
Loading
Loading
+2 −10
Original line number Diff line number Diff line
@@ -251,20 +251,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