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

Commit 532bfa03 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change Id for lock icon flag" into udc-qpr-dev am: aaef6a2d 

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



Change-Id: I2ceac9a0bd5910add2cdae4df2424bd0f5e32ce9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bf44c16 aaef6a2d

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

+5 −5
Original line number Diff line number Diff line
@@ -251,11 +251,6 @@ object Flags { 
    @JvmField

    val MIGRATE_INDICATION_AREA = unreleasedFlag(236, "migrate_indication_area", teamfood = true)



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

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

    @JvmField

    val MIGRATE_LOCK_ICON = unreleasedFlag(238, "migrate_lock_icon")



    /** Whether to listen for fingerprint authentication over keyguard occluding activities. */

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

    @JvmField
@@ -270,6 +265,11 @@ object Flags { 
    @JvmField

    val TRANSIT_CLOCK = unreleasedFlag(239, "lockscreen_custom_transit_clock")



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

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

    @JvmField

    val MIGRATE_LOCK_ICON = unreleasedFlag(240, "migrate_lock_icon")



    // 300 - power menu

    // TODO(b/254512600): Tracking Bug

    @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite")