From fd0261d4c7f6de1555beadc1d981b0cc035d2e92 Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Wed, 26 Oct 2022 05:00:51 +0000
Subject: [PATCH 1/2] Revert "Make new headers flag true by default"

Revert submission 20248350-flipFlag

Reason for revert: Part of DM+Platinum rotation as a culprit for b/255588071.

Reverted Changes:
I51a3b403f:Fix touches in Large screen header
I01da41161:Use split_shade_header in all configurations
Ie0019d212:Make new headers flag true by default

Change-Id: I119bea7e033f28db0539b0aff4a1d02087ee55af
---
 packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 06b7614a469ef..68c18db167c59 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -138,7 +138,7 @@ object Flags {
     @Deprecated("Not needed anymore") val NEW_USER_SWITCHER = ReleasedFlag(500)
 
     // TODO(b/254512321): Tracking Bug
-    @JvmField val COMBINED_QS_HEADERS = ReleasedFlag(501, teamfood = true)
+    @JvmField val COMBINED_QS_HEADERS = UnreleasedFlag(501, teamfood = true)
     val PEOPLE_TILE = ResourceBooleanFlag(502, R.bool.flag_conversations)
     @JvmField
     val QS_USER_DETAIL_SHORTCUT =
@@ -148,7 +148,7 @@ object Flags {
     @Deprecated("Not needed anymore") val NEW_FOOTER = ReleasedFlag(504)
 
     // TODO(b/254512747): Tracking Bug
-    val NEW_HEADER = ReleasedFlag(505, teamfood = true)
+    val NEW_HEADER = UnreleasedFlag(505, teamfood = true)
 
     // TODO(b/254512383): Tracking Bug
     @JvmField

From 31596556eca2b5b35a35f76d30c9eb744bdc3e0a Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Wed, 26 Oct 2022 05:00:51 +0000
Subject: [PATCH 2/2] Revert "Fix touches in Large screen header"

Revert submission 20248350-flipFlag

Reason for revert: Part of DM+Platinum rotation as a culprit for b/255588071.

Reverted Changes:
I51a3b403f:Fix touches in Large screen header
I01da41161:Use split_shade_header in all configurations
Ie0019d212:Make new headers flag true by default

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

diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 159323a5b557b..92ef3f8201cb3 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -42,6 +42,12 @@
         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"/>
@@ -63,15 +69,6 @@
             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"