From 7c9f13310dd5e1ea451c7c55eeb5c917d66b4f2c Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Fri, 4 Jun 2021 14:16:46 -0500
Subject: [PATCH] Do not expand quick settings when shade first opens

Fixes: 187200208
Test: manual
Change-Id: Id5aee36cc8c3c650b007810b752b1fe0955fd263
---
 .../statusbar/phone/NotificationPanelViewController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a7b802ac4afcd..bc21ec766ce12 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2203,7 +2203,7 @@ public class NotificationPanelViewController extends PanelViewController {
         final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());
         final boolean visible = (computeQsExpansionFraction() > 0 || qsPanelBottomY > 0)
                 && !mShouldUseSplitNotificationShade;
-        setQsExpansionEnabled(mAmbientState.getScrollY() == 0);
+        setQsExpansionEnabled(mAmbientState.getScrollY() == 0 && !mAmbientState.isShadeOpening());
 
         if (!mShouldUseSplitNotificationShade) {
             if (mTransitioningToFullShadeProgress > 0.0f) {