commit 6b6bf9cd54d8f0946d9bba3f9ca222757e879d4b
author Mady Mellor <madym@google.com> Wed Jun 22 16:49:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 22 16:49:42 2016 +0000
tree bbdf9b541cc2adad5740dc2ec2455958cd05021d
parent 126088536d63c4a1ae03595a6b3dd82e0f8781b8
parent 53ac1ef993e4bdce0d155fa00a133540f29af0ed

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

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index c8c7d3d..5eaea90 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -152,8 +152,10 @@
             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;