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 am: 32e574fe5c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552227

Change-Id: I0ca66d1e5baf0961774255cd4d62a9b6aafc298a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Brzeziński
2022-11-29 18:12:56 +00:00
committed by Automerger Merge Worker
parent e15d2af160 32e574fe5c
commit 52f48fc86c
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; mExpandedHeight = height;
setIsExpanded(height > 0); setIsExpanded(height > 0);
int minExpansionHeight = getMinExpansionHeight(); int minExpansionHeight = getMinExpansionHeight();
if (height < minExpansionHeight) { if (height < minExpansionHeight && !mShouldUseSplitNotificationShade) {
mClipRect.left = 0; mClipRect.left = 0;
mClipRect.right = getWidth(); mClipRect.right = getWidth();
mClipRect.top = getNotificationsClippingTopBound(); mClipRect.top = 0;
mClipRect.bottom = (int) height; mClipRect.bottom = (int) height;
height = minExpansionHeight; height = minExpansionHeight;
setRequestedClipBounds(mClipRect); setRequestedClipBounds(mClipRect);
@@ -1466,17 +1466,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
notifyAppearChangedListeners(); 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() { private void notifyAppearChangedListeners() {
float appear; float appear;
float expandAmount; float expandAmount;