Merge "Merge \\"Don\\'t show the shade background for heads up... (eff656f4) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -152,8 +152,10 @@ public class StackScrollAlgorithm {
		float newYTranslation = state.yTranslation;
		float newHeight = state.height;
		float newNotificationEnd = newYTranslation + newHeight;

		if (newYTranslation < previousNotificationEnd) {
		boolean isHeadsUp = (child instanceof ExpandableNotificationRow)
		&& ((ExpandableNotificationRow) child).isPinned();
		if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()
		&& !isHeadsUp) {
		// The previous view is overlapping on top, clip!
		float overlapAmount = previousNotificationEnd - newYTranslation;
		state.clipTopAmount = (int) overlapAmount;