Merge "Fixing quick settings locked in split shade" into sc-v2-dev

2021-06-23 15:20:14 +00:00
parent 85f2793b51 ec3ed24507
commit 4a0aaa65bf
1 changed files with 3 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2233,8 +2233,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();
    }