summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chandru S <chandruis@google.com> 2024-09-24 18:03:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-09-24 18:03:36 +0000
commitdbb1abef57b4470f7c3a754d668779a6cf5fc4d7 (patch)
tree3f7c7d210aa5ad733acca8420f481dffdb476771
parent66088972bb00d3768a08e40fda290f1d03a4b79f (diff)
parent81a909acea39cebf8bd5f44ef9d180afba35a853 (diff)
Merge "Add KeyguardRootView below SharedNotificationContainer" into main
-rw-r--r--packages/SystemUI/res/layout/super_notification_shade.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/SystemUI/res/layout/super_notification_shade.xml b/packages/SystemUI/res/layout/super_notification_shade.xml
index fbb07bed4b50..22d34eb7b115 100644
--- a/packages/SystemUI/res/layout/super_notification_shade.xml
+++ b/packages/SystemUI/res/layout/super_notification_shade.xml
@@ -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