Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e858432241

Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
This commit is contained in:
Jorim Jaggi
2016-06-27 20:54:29 +00:00
committed by android-build-merger
parent 157c6811de e858432241
commit 573e85fff8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,8 +154,8 @@ public class StackScrollAlgorithm {
float newNotificationEnd = newYTranslation + newHeight; float newNotificationEnd = newYTranslation + newHeight;
boolean isHeadsUp = (child instanceof ExpandableNotificationRow) boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
&& ((ExpandableNotificationRow) child).isPinned(); && ((ExpandableNotificationRow) child).isPinned();
if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded() if (newYTranslation < previousNotificationEnd
&& !isHeadsUp) { && (!isHeadsUp || ambientState.isShadeExpanded())) {
// The previous view is overlapping on top, clip! // The previous view is overlapping on top, clip!
float overlapAmount = previousNotificationEnd - newYTranslation; float overlapAmount = previousNotificationEnd - newYTranslation;
state.clipTopAmount = (int) overlapAmount; state.clipTopAmount = (int) overlapAmount;