Merge "Fix disappearing notifications when closing fullscreen QS" into sc-dev (68f26fd9) · Commits · e / os / android_frameworks_base

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -382,13 +382,15 @@ public class StackScrollAlgorithm {

		final boolean isHunGoingToShade = ambientState.isShadeExpanded()
		&& view == ambientState.getTrackedHeadsUpRow();
		if (!isHunGoingToShade) {
		if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
		if (isHunGoingToShade) {
		// Keep 100% opacity for heads up notification going to shade.
		} else if (ambientState.isOnKeyguard()) {
		// Adjust alpha for wakeup to lockscreen.
		viewState.alpha = 1f - ambientState.getHideAmount();
		} else if (ambientState.isExpansionChanging()) {
		// Adjust alpha for shade open & close.
		viewState.alpha = Interpolators.getNotificationScrimAlpha(
		ambientState.getExpansionFraction(), true /* notification */);
		} else {
		viewState.alpha = 1f - ambientState.getHideAmount();
		}
		}

		if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {