From c4316e2f707a092d47414e36062669f57b3dfb04 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 6 Jul 2021 19:32:59 +0200 Subject: [PATCH] Fixed an issue where the heads up were not rounded during bypass When huns are above the shelf, their rounding should not be modified Currently they are unrounded by the shelf in certain conditions which didn't unclude the bypass heads up. Fixes: 192057822 Test: add hun on lockscreen with bypass, observe no wrong rounding Change-Id: If7abe2417c40381c74e6ea3b802a6a3e144d45b6 --- .../src/com/android/systemui/statusbar/NotificationShelf.java | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index baac2549055f5..cd5cce4f3ee78 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -367,6 +367,7 @@ public class NotificationShelf extends ActivatableNotificationView implements && !mHostLayoutController.isViewAffectedBySwipe(anv) && !isUnlockedHeadsUp && !isHunGoingToShade + && !anv.isAboveShelf() && !mAmbientState.isPulsing() && !mAmbientState.isDozing();