Merge \"Fix smooth panel deceleration\" into nyc-dev

am: e858432241 Change-Id: I4d66bd10517e05b2b9e930ad4860b371df0bc724
2016-06-27 20:54:26 +00:00
parent a63521f36a e858432241
commit f4704889a6
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -154,8 +154,8 @@ public class StackScrollAlgorithm {
            float newNotificationEnd = newYTranslation + newHeight;
            boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
                    && ((ExpandableNotificationRow) child).isPinned();
-            if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()
-                    && !isHeadsUp) {
+            if (newYTranslation < previousNotificationEnd
+                    && (!isHeadsUp || ambientState.isShadeExpanded())) {
                // The previous view is overlapping on top, clip!
                float overlapAmount = previousNotificationEnd - newYTranslation;
                state.clipTopAmount = (int) overlapAmount;