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

Commit b6644307 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Fixing quick settings locked in split shade" into sc-v2-dev am: 4a0aaa65 

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

Change-Id: I6100835e918b3c74ac54454845afd527bdb0ad1c
parents 3099ab22 4a0aaa65

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

+3 −2
Original line number Diff line number Diff line
@@ -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();

    }