Merge "Revert "Animate shade blur fallback"" into main (df7d66cc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -538,10 +538,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		private void handleBlurSupportedChanged(boolean isBlurSupported) {
		this.mIsBlurSupported = isBlurSupported;
		if (Flags.bouncerUiRevamp()) {
		// TODO: animate blur fallback when the bouncer is pulled up.
		for (ScrimState state : ScrimState.values()) {
		state.setDefaultScrimAlpha(getDefaultScrimAlpha(true));
		}
		updateDefaultScrimAlphas();
		if (isBlurSupported) {
		ScrimState.BOUNCER_SCRIMMED.setNotifBlurRadius(mBlurConfig.getMaxBlurRadiusPx());
		} else {
		@@ -549,17 +546,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		}
		}
		if (Flags.notificationShadeBlur()) {
		float inFrontAlpha = mInFrontAlpha;
		float behindAlpha = mBehindAlpha;
		float notifAlpha = mNotificationsAlpha;

		mState.prepare(mState);
		applyState();
		startScrimAnimation(mScrimBehind, behindAlpha);
		startScrimAnimation(mNotificationsScrim, notifAlpha);
		startScrimAnimation(mScrimInFront, inFrontAlpha);
		dispatchBackScrimState(mScrimBehind.getViewAlpha());
		} else if (Flags.bouncerUiRevamp()) {
		applyAndDispatchState();
		}
		}