From 81a909acea39cebf8bd5f44ef9d180afba35a853 Mon Sep 17 00:00:00 2001
From: Chandru S <chandruis@google.com>
Date: Tue, 24 Sep 2024 06:34:23 +0000
Subject: Add KeyguardRootView below SharedNotificationContainer

SharedNotificationContainer contains the NotificationStackScrollLayout that consumes the touches to the lock icon whenever there are many notifications and the notification shelf is on the same level as the lock icon

NotificationShadeWindowView is a FrameLayout, the view elements that are added later in the XML are on top when there are overlapping view elements.

Fixes: 358424256
Test: verified that the lock icon touches work as expected, with only fingerprint enrolled, with only face enrolled, with co-ex, with no auth enrolled.
Test: manually, easiest way to reproduce the issue
 1. Do not enroll any face/fingerprint
 2. Install the notification test apps
 3. Send many notifications so that the notification shelf appears on the same level as the lock icon
 4. long press the top half of the lock icon that overlaps with the notification shelf.
 5. touch should be handled by the lock icon
Flag: EXEMPT bugfix
Change-Id: Ic27c23fb58a4b0d7d7f0ab588bfccc9dd62804f2
---
 .../SystemUI/res/layout/super_notification_shade.xml     | 16 ++++++++--------
 1 file 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
-- 
cgit v1.2.3-59-g8ed1b