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

Merge "Fix pinched short notification at bottom of lockscreen." into tm-qpr-dev

Browse Source
This commit is contained in:
Jeff DeCew
2022-07-07 18:51:26 +00:00
committed by Android (Google) Code Review
parent 9b723322f1 6f953c4dd8
commit 2f63c77bca
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,7 +398,14 @@ public class NotificationShelf extends ActivatableNotificationView implements
if (child instanceof ActivatableNotificationView) {
ActivatableNotificationView anv =
(ActivatableNotificationView) child;
updateCornerRoundnessOnScroll(anv, viewStart, shelfStart);
// Because we show whole notifications on the lockscreen, the bottom notification is
// always "just about to enter the shelf" by normal scrolling rules. This is fine
// if the shelf is visible, but if the shelf is hidden, it causes incorrect curling.
// notificationClipEnd handles the discrepancy between a visible and hidden shelf,
// so we use that when on the keyguard (and while animating away) to reduce curling.
final float keyguardSafeShelfStart =
mAmbientState.isOnKeyguard() ? notificationClipEnd : shelfStart;
updateCornerRoundnessOnScroll(anv, viewStart, keyguardSafeShelfStart);
}
}