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

am: 0d7ff5328e

Change-Id: Ibb62d63ab18f2d200b4eacd66c260eab7cad0184
This commit is contained in:
Selim Cinek
2017-07-20 20:51:36 +00:00
committed by android-build-merger

View File

@@ -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;