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

Commit 1638f110 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Enable lockscreen_custom_transit_clock for Droidfood" into udc-qpr-dev...

Merge "Enable lockscreen_custom_transit_clock for Droidfood" into udc-qpr-dev am: ba05987c am: 6ff2d203

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



Change-Id: I0fd46eff322657a3d0752606d341525ccce3395d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c179f696 6ff2d203
Loading
Loading
Loading
Loading
+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", teamfood = true)
    @JvmField val TRANSIT_CLOCK = releasedFlag(239, "lockscreen_custom_transit_clock")

    /** Migrate the lock icon view to the new keyguard root view. */
    // TODO(b/286552209): Tracking bug.