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

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

Merge \"Merge \\\"Don\\\'t show the shade background for heads up... 

Merge \"Merge \\\"Don\\\'t show the shade background for heads up notifications\\\" into nyc-dev am: 6b6bf9cd am: f56bcc79\" into nyc-mr1-dev-plus-aosp
am: eff656f4

Change-Id: Ic790cbbb41468f440a34e7b38d8ff8fdf5bd3183
parents 1fb611c7 eff656f4

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java

+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;