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

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

Change-Id: I68feaf8262bb23db08199bff874fc871cff1acfb
parents f86be8d2 2ed613ca

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;