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

Merge "Fix heads up notification corner roundness" into sc-dev am: e74cc3561e

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

Change-Id: I44dee3f71bf016a747f4c054ca03a04354bd8eff
This commit is contained in:
Lyn Han
2021-05-20 04:32:22 +00:00
committed by Automerger Merge Worker
parent 79a36b1cf6 e74cc3561e
commit d3f115f3ae
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,8 +336,13 @@ public class NotificationShelf extends ActivatableNotificationView implements
ActivatableNotificationView anv =
(ActivatableNotificationView) child;
final boolean isUnlockedHeadsUp = !mAmbientState.isOnKeyguard()
&& !mAmbientState.isShadeExpanded()
&& child instanceof ExpandableView
&& ((ExpandableNotificationRow) child).isHeadsUp();
if (viewStart < shelfStart
&& !mHostLayoutController.isViewAffectedBySwipe(anv)
&& !isUnlockedHeadsUp
&& !mAmbientState.isPulsing()
&& !mAmbientState.isDozing()) {