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

Commit ae74e8d8 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: 0d7ff532

Change-Id: Ibb62d63ab18f2d200b4eacd66c260eab7cad0184
parents 5cd07d5a 0d7ff532

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

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            boolean aboveShelf = ViewState.getFinalTranslationZ(row) > baseZHeight;

            boolean isLastChild = child == lastChild;

            float rowTranslationY = row.getTranslationY();

            if (isLastChild || aboveShelf || backgroundForceHidden) {

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

                notificationClipEnd = shelfStart + getIntrinsicHeight();

            } else {

                notificationClipEnd = shelfStart - mPaddingBetweenElements;