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

Commit f359eb5d 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... 

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

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

Change-Id: I82573b6e1b3ae9c9f0262fd2893003ccffbed628
parents 4ebda09e 512986e3

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

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

                    expandingAnimated, isLastChild);



            final float stackEnd = mAmbientState.getStackY()

                    + mAmbientState.getStackHeight();

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

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

                notificationClipEnd = stackEnd;

                notificationClipEnd = shelfStart + getIntrinsicHeight();

            } else {

                notificationClipEnd = shelfStart - mPaddingBetweenElements;

            }