summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-30 03:37:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 03:37:04 +0000
commit532bfa03f93d368b507c8e7983eebb5a5845f3dc (patch)
tree766c9544a1630b0c2f256a99489f76ba14d7e5c9
parent5bf44c16d4baa9eabab000f276c87e7a62d0e771 (diff)
parentaaef6a2d2c25e75302e52d371cb73b078b4ebbe3 (diff)
Merge "Change Id for lock icon flag" into udc-qpr-dev am: aaef6a2d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23863412 Change-Id: I2ceac9a0bd5910add2cdae4df2424bd0f5e32ce9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/flags/Flags.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 94c85514f721..a940de749da3 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -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")