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

Commit 1352b074 authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Revert logic to calculate StackEndHeight 

This partially reverts the logic to compute the stackEndHeight, as it doesn't make the shelf stick at the bottom when scrolling notifications. This might reintroduce the bug of trimmed notifications on lockscreen, that will be addressed in another cl.

Bug: 227733494
Bug: 214504318
Fixes: 226054279
Test: Test: atest ShelfInvisibleWithLowNotifications && atest ShelfVisibleAtTheBottom
Change-Id: I20286eb961d46439a0d80980c085a41b93241cb8
parent 85991042

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

+5 −4
Original line number Diff line number Diff line
@@ -1315,14 +1315,15 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (mOnStackYChanged != null) {

            mOnStackYChanged.accept(listenerNeedsAnimation);

        }

        if ((mQsExpansionFraction <= 0 || !mQsFullScreen) && !shouldSkipHeightUpdate()) {

            final float endHeight = updateStackEndHeight();

        if (mQsExpansionFraction <= 0 && !shouldSkipHeightUpdate()) {

            final float endHeight = updateStackEndHeight(

                    getHeight(), getEmptyBottomMargin(), mTopPadding);

            updateStackHeight(endHeight, fraction);

        }

    }



    private float updateStackEndHeight() {

        final float stackEndHeight = Math.max(0f, mIntrinsicContentHeight);

    private float updateStackEndHeight(float height, float bottomMargin, float topPadding) {

        final float stackEndHeight = Math.max(0f, height - bottomMargin - topPadding);

        mAmbientState.setStackEndHeight(stackEndHeight);

        return stackEndHeight;

    }