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

Commit ace4bdb5 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 am: ef459ac0 

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

Change-Id: Ie7c225231f0771a55daf58896ffb03c1ee490bb4
parents abc52173 ef459ac0

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();

    }