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

Commit 5cec2ce9 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Restore shelf clip logic from R to prevent clipping on collapse." into sc-dev am: fe9b6d5e 

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

Change-Id: I9acea192d0b5e701d0d40a3074882847637b1df0
parents 7da2c4f5 fe9b6d5e

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -259,11 +259,9 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            final float inShelfAmount = updateShelfTransformation(i, child, scrollingFast,

            final float inShelfAmount = updateShelfTransformation(i, child, scrollingFast,

                    expandingAnimated, isLastChild);

                    expandingAnimated, isLastChild);





            final float stackEnd = mAmbientState.getStackY()

                    + mAmbientState.getStackHeight();

            // TODO(b/172289889) scale mPaddingBetweenElements with expansion amount

            // TODO(b/172289889) scale mPaddingBetweenElements with expansion amount

            if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) {

            if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) {

                notificationClipEnd = stackEnd;

                notificationClipEnd = shelfStart + getIntrinsicHeight();

            } else {

            } else {

                notificationClipEnd = shelfStart - mPaddingBetweenElements;

                notificationClipEnd = shelfStart - mPaddingBetweenElements;

            }

            }