commit ec3ed24507c7ec5b32d2e4fd1d5be7b78db927a7
author Michal Brzezinski <brzezinski@google.com> Mon Jun 21 18:14:40 2021 +0100
committer Michał Brzeziński <brzezinski@google.com> Tue Jun 22 14:26:44 2021 +0000
tree 08ba88ce9f9ac23f8a899baf2095bcbae3925308
parent 235a0bf9bd25319bd5f379d01252b5a3c13a290e

Fixing quick settings locked in split shade

Values of scrollY and range to top in split shade made "mAmbientState.getScrollY() <= scrollRangeToTop" always false and thus qs expansion was always disabled.

Test: Expand split shade, expand QS
Fixes: 191622712
Fixes: 191226077
Change-Id: I916a895aa7abeaf3e5739b503458fe47aac219c2

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 2e5c21d..596bf3d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2234,8 +2234,9 @@
 
     private void updateQSExpansionEnabledAmbient() {
         final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight;
-        mQsExpansionEnabledAmbient =
-                mAmbientState.getScrollY() <= scrollRangeToTop && !mAmbientState.isShadeOpening();
+        mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade
+                || (mAmbientState.getScrollY() <= scrollRangeToTop
+                && !mAmbientState.isShadeOpening());
         setQsExpansionEnabled();
     }