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

Commit fe76e308 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca

am: 8b1a5af4

Change-Id: Ic902c6e9c05046bf5b02dc7ab23b943730fce7d7
parents 5cd07d5a 8b1a5af4
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -244,7 +244,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
            boolean aboveShelf = ViewState.getFinalTranslationZ(row) > baseZHeight;
            boolean aboveShelf = ViewState.getFinalTranslationZ(row) > baseZHeight;
            boolean isLastChild = child == lastChild;
            boolean isLastChild = child == lastChild;
            float rowTranslationY = row.getTranslationY();
            float rowTranslationY = row.getTranslationY();
            if (isLastChild || aboveShelf || backgroundForceHidden) {
            if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) {
                notificationClipEnd = shelfStart + getIntrinsicHeight();
                notificationClipEnd = shelfStart + getIntrinsicHeight();
            } else {
            } else {
                notificationClipEnd = shelfStart - mPaddingBetweenElements;
                notificationClipEnd = shelfStart - mPaddingBetweenElements;