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

Commit 3741a887 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Hide notification footer when QS is expanded.

This prevents an incorrect animation that occurs if the first notification appears while QS is expanded.

Fixes: 201427195
Test: clear shade; expand QS; post notification; observe footer is never visible
Merged-In: Id00a168720a52b491ca3d2de1fbee7cf46b2a683
Change-Id: Id00a168720a52b491ca3d2de1fbee7cf46b2a683
parent 35eaf77b
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
        boolean showFooterView = (showDismissView || getVisibleNotificationCount() > 0)
                && mIsCurrentUserSetup  // see: b/193149550
                && mStatusBarState != StatusBarState.KEYGUARD
                && mQsExpansionFraction != 1
                && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()
                && !mIsRemoteInputActive;
        boolean showHistory = Settings.Secure.getIntForUser(mContext.getContentResolver(),
@@ -4766,6 +4767,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable

    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
    public void setQsExpansionFraction(float qsExpansionFraction) {
        boolean footerAffected = mQsExpansionFraction != qsExpansionFraction
                && (mQsExpansionFraction == 1 || qsExpansionFraction == 1);
        mQsExpansionFraction = qsExpansionFraction;
        updateUseRoundedRectClipping();

@@ -4774,6 +4777,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
        if (mOwnScrollY > 0) {
            setOwnScrollY((int) MathUtils.lerp(mOwnScrollY, 0, mQsExpansionFraction));
        }
        if (footerAffected) {
            updateFooter();
        }
    }

    @ShadeViewRefactor(RefactorComponent.COORDINATOR)