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

Merge "Fix hun-to-shade corner clipping" into sc-dev

Browse Source
This commit is contained in:
Lyn Han
2021-05-26 21:33:15 +00:00
committed by Android (Google) Code Review
parent f010ed6344 1988f9e0d3
commit 6fda802363
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,9 +358,13 @@ public class NotificationShelf extends ActivatableNotificationView implements
&& anv instanceof ExpandableNotificationRow && anv instanceof ExpandableNotificationRow
&& ((ExpandableNotificationRow) anv).isHeadsUp(); && ((ExpandableNotificationRow) anv).isHeadsUp();
final boolean isHunGoingToShade = mAmbientState.isShadeExpanded()
&& anv == mAmbientState.getTrackedHeadsUpRow();
final boolean shouldUpdateCornerRoundness = viewStart < shelfStart final boolean shouldUpdateCornerRoundness = viewStart < shelfStart
&& !mHostLayoutController.isViewAffectedBySwipe(anv) && !mHostLayoutController.isViewAffectedBySwipe(anv)
&& !isUnlockedHeadsUp && !isUnlockedHeadsUp
&& !isHunGoingToShade
&& !mAmbientState.isPulsing() && !mAmbientState.isPulsing()
&& !mAmbientState.isDozing(); && !mAmbientState.isDozing();