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

Commit 2bdc0b25 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "lockscreen_custom_transit_clock - Enable teamfood" into udc-qpr-dev am:... 

Merge "lockscreen_custom_transit_clock - Enable teamfood" into udc-qpr-dev am: 1d2f16e5 am: 8a855315

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



Change-Id: I60efa81eee732a71658d8ea98b9c000b169aaa32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69c4efbc 8a855315

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ object Flags { 
    @JvmField val KEYGUARD_TALKBACK_FIX = releasedFlag(238, "keyguard_talkback_fix")



    // TODO(b/287268101): Tracking bug.

    @JvmField val TRANSIT_CLOCK = unreleasedFlag(239, "lockscreen_custom_transit_clock")

    @JvmField val TRANSIT_CLOCK = unreleasedFlag(239, "lockscreen_custom_transit_clock", teamfood = true)



    /** Migrate the lock icon view to the new keyguard root view. */

    // TODO(b/286552209): Tracking bug.