From ec3ed24507c7ec5b32d2e4fd1d5be7b78db927a7 Mon Sep 17 00:00:00 2001
From: Michal Brzezinski <brzezinski@google.com>
Date: Mon, 21 Jun 2021 18:14:40 +0100
Subject: [PATCH] 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
---
 .../statusbar/phone/NotificationPanelViewController.java     | 5 +++--
 1 file changed, 3 insertions(+), 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 2e5c21d9cb429..596bf3d1ee96f 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 @@ public class NotificationPanelViewController extends PanelViewController {
 
     private void updateQSExpansionEnabledAmbient() {
         final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight;
-        mQsExpansionEnabledAmbient =
-                mAmbientState.getScrollY() <= scrollRangeToTop && !mAmbientState.isShadeOpening();
+        mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade
+                || (mAmbientState.getScrollY() <= scrollRangeToTop
+                && !mAmbientState.isShadeOpening());
         setQsExpansionEnabled();
     }