Merge \\"Fix smooth panel deceleration\\" into nyc-dev am: e858432241

am: 573e85fff8

Change-Id: Ifd3c5ce0f2857d30a1fd9b632a2fcc0522cedf70
This commit is contained in:
Jorim Jaggi
2016-06-27 21:02:56 +00:00
committed by android-build-merger

View File

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