Merge "Revert "Animate shade blur fallback"" into main

1 files changed, 1 insertions, 14 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index f3d72027238f..d68f7df79cd5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -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();
         }
     }