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

This commit is contained in:
TreeHugger Robot
2017-07-20 20:27:35 +00:00
committed by Android (Google) Code Review

View File

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