summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2016-06-27 11:50:58 -0700
committer Jorim Jaggi <jjaggi@google.com> 2016-06-27 18:54:34 +0000
commit0fdf574bc891a0f98b17159ee9156dae4044577c (patch)
tree0d2160fb9ff5f40b3e07f88b3259b7561b081891
parent5836c9e658dd63f2e1ba505155bf66bff41a9f85 (diff)
Fix smooth panel deceleration
State of dismiss view was wrong when the panel was closed, thus, we didn't apply our logic for smooth panel deceleration anymore. Bug: 29579394 Change-Id: I79718517e776adad092457aba6db18219998fde1
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java4
1 files changed, 2 insertions, 2 deletions
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 5eaea90479ce..87e87c8e9bb3 100644
--- 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;