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

Commit 5bd6473b authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Enable QS open while notifications are scrolled below status bar" into... 

Merge "Enable QS open while notifications are scrolled below status bar" into sc-dev am: bc014c2d am: 90d75fb7

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

Change-Id: Ie07b25da960fa9440a91b51543363ef03eba19ad
parents cdc00da3 90d75fb7

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+6 −0
Original line number Diff line number Diff line
@@ -4550,6 +4550,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void setQsExpansionFraction(float qsExpansionFraction) {

        mQsExpansionFraction = qsExpansionFraction;



        // If notifications are scrolled,

        // clear out scrollY by the time we push notifications offscreen

        if (mOwnScrollY > 0) {

            setOwnScrollY((int) MathUtils.lerp(mOwnScrollY, 0, mQsExpansionFraction));

        }

    }



    @ShadeViewRefactor(RefactorComponent.COORDINATOR)

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

+2 −1
Original line number Diff line number Diff line
@@ -2213,8 +2213,9 @@ public class NotificationPanelViewController extends PanelViewController { 
    }



    private void updateQSExpansionEnabledAmbient() {

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

        mQsExpansionEnabledAmbient =

                mAmbientState.getScrollY() <= 0 && !mAmbientState.isShadeOpening();

                mAmbientState.getScrollY() <= scrollRangeToTop && !mAmbientState.isShadeOpening();

        setQsExpansionEnabled();

    }