commit 8b6cc5fd2e01124f0750121bc0747135a08b5161
author Lyn Han <lynhan@google.com> Sat Jun 05 04:55:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 05 04:55:52 2021 +0000
tree 16174d95b842aa9cfc831bc29e2780d02068a629
parent 4ba381fd832919abc3059c86f493cfc3cbfa6fdf
parent 7c9f13310dd5e1ea451c7c55eeb5c917d66b4f2c

Merge "Do not expand quick settings when shade first opens" into sc-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

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 f545710..3a01791 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 @@
         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) {