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

Commit 1a6abb68 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exclude scrim padding when calculating stack height on lockscreen" into... 

Merge "Exclude scrim padding when calculating stack height on lockscreen" into sc-dev am: bb793e1b

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

Change-Id: I251716e0c31d8cbe561ad7bc430ef2678f79e3de
parents d12990fa bb793e1b

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

+2 −1
Original line number Diff line number Diff line
@@ -1149,8 +1149,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            mOnStackYChanged.run();

        }

        if (mQsExpansionFraction <= 0) {

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

            final float stackEndHeight = Math.max(0f,

                    getHeight() - getEmptyBottomMargin() - stackY - mSidePaddings);

                    getHeight() - getEmptyBottomMargin() - stackY - scrimTopPadding);

            mAmbientState.setStackEndHeight(stackEndHeight);

            mAmbientState.setStackHeight(

                    MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,