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

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

Browse Source 
am: 2ed613ca80

Change-Id: Id697948b665319b83b6becfa56a0148a13149ae3
This commit is contained in:
Selim Cinek
2017-07-20 20:38:27 +00:00
committed by android-build-merger
parent dbb5c98423 2ed613ca80
commit 8b1a5af473
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
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;