Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd

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

Change-Id: I0c984f6a9d3a304f11f66b87e4b0e5885cd0e173
This commit is contained in:
Julia Reynolds
2021-07-08 23:24:09 +00:00
committed by Automerger Merge Worker

View File

@@ -367,6 +367,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
&& !mHostLayoutController.isViewAffectedBySwipe(anv) && !mHostLayoutController.isViewAffectedBySwipe(anv)
&& !isUnlockedHeadsUp && !isUnlockedHeadsUp
&& !isHunGoingToShade && !isHunGoingToShade
&& !anv.isAboveShelf()
&& !mAmbientState.isPulsing() && !mAmbientState.isPulsing()
&& !mAmbientState.isDozing(); && !mAmbientState.isDozing();