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

Commit dbb1abef authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Add KeyguardRootView below SharedNotificationContainer" into main

parents 66088972 81a909ac
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -58,14 +58,6 @@
             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"
        android:clipChildren="false"
        />

    <!-- Shared container for the notification stack. Can be positioned by either
         the keyguard_root_view or notification_panel -->
    <com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer
@@ -76,6 +68,14 @@
        android:clipToPadding="false"
        />

    <!-- 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"
        android:clipChildren="false"
        />

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

    <com.android.systemui.scrim.ScrimView