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

Commit 82fa5348 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 sc-dev am: bc014c2d

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

Change-Id: I72345e34202096184c91544140b05c6b7062700d
parents d5e7b856 bc014c2d
Loading
Loading
Loading
Loading
+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)
+2 −1
Original line number Diff line number Diff line
@@ -2200,8 +2200,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();
    }