Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19edcd74 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I63bd16dc8ec6d3d51eaf1a67fc5022f7f2e11025
parents ae286294 d3f115f3

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+5 −0
Original line number Diff line number Diff line
@@ -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()) {