commit f475ad8cd10488c6f50d912ac666c056080a4ada
author Brad Hinegardner <bhinegardner@google.com> Fri Nov 03 18:00:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 03 18:00:10 2023 +0000
tree a9b2c7cbf46b2daadb36dcf6f94c91f86dc8fb63
parent 80d939a49c03e1d1f57d08675f4bd0bb3228967a
parent 38bca5bbe4b3b1833e3bb52c454f059b77e4d8e9

Merge "Remove MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA and MIGRATE_LOCK_ICON from teamfood" into main

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

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index fa98661..c1106b3 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -258,7 +258,7 @@
     // TODO(b/290652751): Tracking bug.
     @JvmField
     val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =
-        unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true)
+        unreleasedFlag("migrate_split_keyguard_bottom_area")
 
     // TODO(b/297037052): Tracking bug.
     @JvmField
@@ -273,7 +273,7 @@
 
     /** Migrate the lock icon view to the new keyguard root view. */
     // TODO(b/286552209): Tracking bug.
-    @JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon", teamfood = true)
+    @JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon")
 
     // TODO(b/288276738): Tracking bug.
     @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")