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

Commit 1d9a175a authored by Lyn Han's avatar Lyn Han
Browse files

Fix fluctuating notification height during shade open 

Fixes: 188206952
Test: manual
Change-Id: I32a1861b419264cf45b75e9934a04294c1e11942
parent 25ad0530

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

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (mQsExpansionFraction <= 0) {

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

            final float stackEndHeight = Math.max(0f,

                    getHeight() - getEmptyBottomMargin() - stackY);

                    getHeight() - getEmptyBottomMargin() - mTopPadding);

            mAmbientState.setStackEndHeight(stackEndHeight);

            mAmbientState.setStackHeight(

                    MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,

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

+6 −7
Original line number Diff line number Diff line
@@ -348,14 +348,14 @@ public class StackScrollAlgorithm { 
            StackScrollAlgorithmState algorithmState,

            AmbientState ambientState) {



        final boolean isShowingShelf = ambientState.getShelf() != null

        final boolean showingShelf = ambientState.getShelf() != null

                && algorithmState.firstViewInShelf != null;



        final float stackHeight = ambientState.getStackHeight()

                - (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);

        final float shelfHeight = showingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f;

        final float scrimPadding = ambientState.isOnKeyguard() ? 0 : mNotificationScrimPadding;



        float stackEndHeight = ambientState.getStackEndHeight()

                - (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);

        final float stackHeight = ambientState.getStackHeight()  - shelfHeight - scrimPadding;

        final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding;



        return stackHeight / stackEndHeight;

    }
@@ -459,8 +459,7 @@ public class StackScrollAlgorithm { 
                    maxViewHeight = algorithmState.viewHeightBeforeShelf;

                }

            }

            viewState.height = (int) MathUtils.lerp(maxViewHeight * START_FRACTION, maxViewHeight,

                    expansionFraction);

            viewState.height = (int) (maxViewHeight * expansionFraction);

        }



        currentYPosition += viewState.height + expansionFraction * mPaddingBetweenElements;