From f9a69c60840344c7c3d579f87bcce4ef6338102f Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Tue, 29 Jun 2021 18:13:53 -0500
Subject: [PATCH] Enable qs open while shade expansion is still running

Fixes: 190837480
Test: slowly fling shade open, swipe qs open => qs opens, qs does not
show extra tiles during shade open (before second swipe to open qs)

Change-Id: I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8
---
 .../statusbar/phone/NotificationPanelViewController.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 38fcb4b21e749..11feea581708c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2286,8 +2286,7 @@ public class NotificationPanelViewController extends PanelViewController {
     private void updateQSExpansionEnabledAmbient() {
         final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight;
         mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade
-                || (mAmbientState.getScrollY() <= scrollRangeToTop
-                && !mAmbientState.isShadeOpening());
+                || (mAmbientState.getScrollY() <= scrollRangeToTop);
         setQsExpansionEnabled();
     }