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

Commit 885dde6a authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Restore shelf clip logic from R to prevent clipping on collapse. 

Fixes: 187653275
Test: Expand/collapse shade/notification with/without shelf
Change-Id: I03024c6a3adfb40f1d585f4bac2644aec9050261
parent 6c9c6cb6

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;

            }