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

Commit f56bcc79 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev

am: 6b6bf9cd

Change-Id: Ic6d8f5c1d1a8eed8e0bc9657c11c77890cd64e7c
parents a5076ef7 6b6bf9cd
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ public class StackScrollAlgorithm {
            float newYTranslation = state.yTranslation;
            float newHeight = state.height;
            float newNotificationEnd = newYTranslation + newHeight;

            if (newYTranslation < previousNotificationEnd) {
            boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
                    && ((ExpandableNotificationRow) child).isPinned();
            if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()
                    && !isHeadsUp) {
                // The previous view is overlapping on top, clip!
                float overlapAmount = previousNotificationEnd - newYTranslation;
                state.clipTopAmount = (int) overlapAmount;