From a99cffb85e765df096435a3489206579b7d9452d Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Thu, 20 Oct 2022 17:10:24 -0400
Subject: [PATCH] Fix touches in Large screen header

When using large screen header and QS can scroll, the
NonInterceptingScrollView was intercepting the touches.

By moving the view after the qs_frame (in the children list), this makes
sure that the header has a chance to intercept touches first.

Test: manual, large display size (so it scrolls). Click on privacy
indicators and network settings.
Test: atest CtsPermission4TestCases

Fixes: 252791648
Change-Id: I91362981d34acd703487acfca8e8bd6f8fa953e9
---
 .../SystemUI/res/layout/status_bar_expanded.xml   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 92ef3f8201cb3..159323a5b557b 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -42,12 +42,6 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <ViewStub
-            android:id="@+id/qs_header_stub"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-        />
-
         <include
             layout="@layout/keyguard_status_view"
             android:visibility="gone"/>
@@ -69,6 +63,15 @@
             systemui:layout_constraintBottom_toBottomOf="parent"
         />
 
+        <!-- This view should be after qs_frame so touches are dispatched first to it. That gives
+             it a chance to capture clicks before the NonInterceptingScrollView disallows all
+             intercepts -->
+        <ViewStub
+            android:id="@+id/qs_header_stub"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+        />
+
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/qs_edge_guideline"
             android:layout_width="wrap_content"