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

Commit 4dd9ec3b authored by Coco Duan's avatar Coco Duan Committed by Automerger Merge Worker
Browse files

Merge "Add flag to show/hide standalone weather dream complication" into...

Merge "Add flag to show/hide standalone weather dream complication" into tm-qpr-dev am: 97cef3f4 am: 326d580b am: 230c90d2 am: f8abb5f5

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



Change-Id: Ib63b83111c74fc7404dbb772f38d61a5d062154c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d2ad820 f8abb5f5
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -238,6 +238,11 @@ object Flags {
    @JvmField
    val HIDE_SMARTSPACE_ON_DREAM_OVERLAY = unreleasedFlag(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")

    // 500 - quick settings

    val PEOPLE_TILE = resourceBooleanFlag(502, R.bool.flag_conversations, "people_tile")