Merge "Keep HUN opaque for transition to shade" into sc-dev am: 38cb397b8d am: 276eb111a9 (83836d8c) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -380,12 +380,16 @@ public class StackScrollAlgorithm {
	ExpandableViewState viewState = view.getViewState();		ExpandableViewState viewState = view.getViewState();
	viewState.location = ExpandableViewState.LOCATION_UNKNOWN;		viewState.location = ExpandableViewState.LOCATION_UNKNOWN;

			final boolean isHunGoingToShade = ambientState.isShadeExpanded()
			&& view == ambientState.getTrackedHeadsUpRow();
			if (!isHunGoingToShade) {
	if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {		if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
	viewState.alpha = Interpolators.getNotificationScrimAlpha(		viewState.alpha = Interpolators.getNotificationScrimAlpha(
	ambientState.getExpansionFraction(), true /* notification */);		ambientState.getExpansionFraction(), true /* notification */);
	} else {		} else {
	viewState.alpha = 1f - ambientState.getHideAmount();		viewState.alpha = 1f - ambientState.getHideAmount();
	}		}
			}

	if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {		if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {
	// Even if we're not scrolled away we're in view and we're also not in the		// Even if we're not scrolled away we're in view and we're also not in the