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

Commit 40212250 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Hide notification footer when QS is expanded." into sc-v2-dev am: 209eb582 

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

Change-Id: Id5da26c6e0b45e657136aa83287f9b1ff9714fe1
parents 32d32efa 209eb582

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

+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)