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

Commit c707afc7 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes I34d4d65d,I3d569114 into udc-qpr-dev 

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

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

+6 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ object Flags { 
    /** 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 @@ object Flags { 
    @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")