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

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

Merge "Fix hun-to-shade corner clipping" into sc-dev am: 6fda8023 am: c1d1f8c8 

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

Change-Id: Ia1cfdb04c278a2d85e16c4911c65ba941409ccc7
parents e498db5c c1d1f8c8

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

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