Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aa94d0d authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Enable qs open while shade expansion is still running" into sc-v2-dev... 

Merge "Enable qs open while shade expansion is still running" into sc-v2-dev am: ef459ac0 am: ace4bdb5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191039

Change-Id: I82338bacd1f384e46b1a3dbc52ccd602fd6de713
parents 4bb67ef5 ace4bdb5

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

+1 −2
Original line number Diff line number Diff line
@@ -2286,8 +2286,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private void updateQSExpansionEnabledAmbient() {

        final float scrollRangeToTop = mAmbientState.getTopPadding() - mQuickQsOffsetHeight;

        mQsExpansionEnabledAmbient = mShouldUseSplitNotificationShade

                || (mAmbientState.getScrollY() <= scrollRangeToTop

                && !mAmbientState.isShadeOpening());

                || (mAmbientState.getScrollY() <= scrollRangeToTop);

        setQsExpansionEnabled();

    }