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

Commit ef4e537d authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Include the FooterView height in the stackHeight stored in... 

Merge "Include the FooterView height in the stackHeight stored in NotificationViewHeightRepository" into main
parents 57fdee44 db3f523c

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

+2 −1
Original line number Diff line number Diff line
@@ -2399,12 +2399,13 @@ public class NotificationStackScrollLayout 
    private void updateContentHeight() {

        final float scrimTopPadding = mAmbientState.isOnKeyguard() ? 0 : mMinimumPaddings;

        final int shelfIntrinsicHeight = mShelf != null ? mShelf.getIntrinsicHeight() : 0;

        final int footerIntrinsicHeight = mFooterView != null ? mFooterView.getIntrinsicHeight() : 0;

        final float height =

                (int) scrimTopPadding + (int) mNotificationStackSizeCalculator.computeHeight(

                        /* notificationStackScrollLayout= */ this, mMaxDisplayedNotifications,

                        shelfIntrinsicHeight);

        mIntrinsicContentHeight = height;

        mScrollViewFields.sendStackHeight(height);

        mScrollViewFields.sendStackHeight(height + footerIntrinsicHeight);



        // The topPadding can be bigger than the regular padding when qs is expanded, in that

        // state the maxPanelHeight and the contentHeight should be bigger