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

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

Merge changes I01be5d15,I5976d1a7 into udc-qpr-dev 

* changes:
  Enable migrate_indication_area For Teamfood
  Move keyguard root view in z-order
parents 225465e0 ff78df0c

packages/SystemUI/res/layout/super_notification_shade.xml

+5 −5
Original line number Diff line number Diff line
@@ -65,17 +65,17 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <include layout="@layout/status_bar_expanded"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:visibility="invisible" />



    <!-- Root for all keyguard content. It was previously located within the shade. -->

    <com.android.systemui.keyguard.ui.view.KeyguardRootView

        android:id="@id/keyguard_root_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <include layout="@layout/status_bar_expanded"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:visibility="invisible" />



    <include layout="@layout/brightness_mirror_container" />



    <com.android.systemui.scrim.ScrimView

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

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,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")

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



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

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