Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restore shelf clip logic from R to prevent clipping on collapse." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-06-15 16:25:57 +00:00
committed by Android (Google) Code Review
parent 199596b110 885dde6a2c
commit fe9b6d5e0d
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -259,11 +259,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
final float inShelfAmount = updateShelfTransformation(i, child, scrollingFast, final float inShelfAmount = updateShelfTransformation(i, child, scrollingFast,
expandingAnimated, isLastChild); expandingAnimated, isLastChild);
final float stackEnd = mAmbientState.getStackY()
+ mAmbientState.getStackHeight();
// TODO(b/172289889) scale mPaddingBetweenElements with expansion amount // TODO(b/172289889) scale mPaddingBetweenElements with expansion amount
if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) { if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) {
notificationClipEnd = stackEnd; notificationClipEnd = shelfStart + getIntrinsicHeight();
} else { } else {
notificationClipEnd = shelfStart - mPaddingBetweenElements; notificationClipEnd = shelfStart - mPaddingBetweenElements;
} }