Merge "[flexiglass] Remove an unflagged change from StackScrollAlgorithm" into main (f7af3c7d) · Commits · e / os / android_frameworks_base

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

+15 −8

Original line number	Diff line number	Diff line
		@@ -148,23 +148,30 @@ public class StackScrollAlgorithm {
		if (isHunGoingToShade) {
		// Keep 100% opacity for heads up notification going to shade.
		viewState.setAlpha(1f);
		} else if ((!SceneContainerFlag.isEnabled() && ambientState.isOnKeyguard())
		\|\| ambientState.isShowingStackOnLockscreen()) {
		} else if (!SceneContainerFlag.isEnabled() && ambientState.isOnKeyguard()) {
		// Adjust alpha for wakeup to lockscreen.
		if (view.isHeadsUpState()) {
		// Pulsing HUN should be visible on AOD and stay visible during
		// AOD=>lockscreen transition
		viewState.setAlpha(1f - ambientState.getHideAmount());
		} else if (SceneContainerFlag.isEnabled()) {
		// Take into account scene container-specific Lockscreen fade-in progress
		float fadeAlpha = ambientState.getLockscreenStackFadeInProgress();
		float dozeAlpha = 1f - ambientState.getDozeAmount();
		viewState.setAlpha(Math.min(dozeAlpha, fadeAlpha));
		} else {
		// Normal notifications are hidden on AOD and should fade in during
		// AOD=>lockscreen transition
		viewState.setAlpha(1f - ambientState.getDozeAmount());
		}
		} else if (SceneContainerFlag.isEnabled()
		&& ambientState.isShowingStackOnLockscreen()) {
		// Adjust alpha for wakeup to lockscreen.
		if (view.isHeadsUpState()) {
		// Pulsing HUN should be visible on AOD and stay visible during
		// AOD=>lockscreen transition
		viewState.setAlpha(1f - ambientState.getHideAmount());
		} else {
		// Take into account scene container-specific Lockscreen fade-in progress
		float fadeAlpha = ambientState.getLockscreenStackFadeInProgress();
		float dozeAlpha = 1f - ambientState.getDozeAmount();
		viewState.setAlpha(Math.min(dozeAlpha, fadeAlpha));
		}
		} else if (ambientState.isExpansionChanging()) {
		// Adjust alpha for shade open & close.
		float expansion = ambientState.getExpansionFraction();