commit c707afc784f5a6b2604c7f5bfb7cedad4805054e
author Matt Pietal <mpietal@google.com> Wed Jul 19 15:13:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 19 15:13:11 2023 +0000
tree 52c9cedc0c43981235bb43a68cf047fda55e601b
parent febba3b65f7279cead5c1762bd75bbf89af21dea
parent b2052c4e6da444e692c4183f07318b1a350b04e5

Merge changes I34d4d65d,I3d569114 into udc-qpr-dev

* changes:
  Enable MIGRATE_INDICATION_AREA For Droidfood
  Add flag for keyguard status view migration

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 0670ec3..79a1728 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -254,7 +254,7 @@
     /** Migrate the indication area to the new keyguard root view. */
     // TODO(b/280067944): Tracking bug.
     @JvmField
-    val MIGRATE_INDICATION_AREA = unreleasedFlag(236, "migrate_indication_area", teamfood = true)
+    val MIGRATE_INDICATION_AREA = releasedFlag(236, "migrate_indication_area")
 
     /**
      * Migrate the bottom area to the new keyguard root view.
@@ -294,6 +294,11 @@
     @JvmField
     val MIGRATE_NSSL = unreleasedFlag(242, "migrate_nssl")
 
+    /** Migrate the status view from the notification panel to keyguard root view. */
+    // TODO(b/291767565): Tracking bug.
+    @JvmField
+    val MIGRATE_KEYGUARD_STATUS_VIEW = unreleasedFlag(243, "migrate_keyguard_status_view")
+
     // 300 - power menu
     // TODO(b/254512600): Tracking Bug
     @JvmField val POWER_MENU_LITE = releasedFlag(300, "power_menu_lite")