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

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

Browse Source 
am: 6b6bf9cd54

Change-Id: Ic6d8f5c1d1a8eed8e0bc9657c11c77890cd64e7c
This commit is contained in:
Mady Mellor
2016-06-22 16:54:08 +00:00
committed by android-build-merger
parent a5076ef7fa 6b6bf9cd54
commit f56bcc7925
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,8 +152,10 @@ public class StackScrollAlgorithm {
float newYTranslation = state.yTranslation; float newYTranslation = state.yTranslation;
float newHeight = state.height; float newHeight = state.height;
float newNotificationEnd = newYTranslation + newHeight; float newNotificationEnd = newYTranslation + newHeight;
boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
if (newYTranslation < previousNotificationEnd) { && ((ExpandableNotificationRow) child).isPinned();
if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()
&& !isHeadsUp) {
// 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;