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

Merge "Fixing HUN translation and clipping when swiping up in split shade" into tm-qpr-dev

Browse Source
This commit is contained in:
Michał Brzeziński
2022-11-29 17:57:03 +00:00
committed by Android (Google) Code Review
parent ae06460d37 e55a4b541a
commit 32e574fe5c
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -1401,10 +1401,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mExpandedHeight = height;
setIsExpanded(height > 0);
int minExpansionHeight = getMinExpansionHeight();
if (height < minExpansionHeight) {
if (height < minExpansionHeight && !mShouldUseSplitNotificationShade) {
mClipRect.left = 0;
mClipRect.right = getWidth();
mClipRect.top = getNotificationsClippingTopBound();
mClipRect.top = 0;
mClipRect.bottom = (int) height;
height = minExpansionHeight;
setRequestedClipBounds(mClipRect);
@@ -1466,17 +1466,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
notifyAppearChangedListeners();
}
private int getNotificationsClippingTopBound() {
if (isHeadsUpTransition()) {
// HUN in split shade can go higher than bottom of NSSL when swiping up so we want
// to give it extra clipping margin. Because clipping has rounded corners, we also
// need to account for that corner clipping.
return -mAmbientState.getStackTopMargin() - mCornerRadius;
} else {
return 0;
}
}
private void notifyAppearChangedListeners() {
float appear;
float expandAmount;