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

Commit 1f5c93eb authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge "Revert logic to calculate StackEndHeight" into tm-dev

parents 30eec56e 1352b074

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

+5 −4
Original line number Diff line number Diff line
@@ -1317,14 +1317,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;

    }