Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cef087c authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Revert "Animate shade blur fallback" 

This reverts commit e0677abe.

Reason for revert: Previously there was a bug so the blur isn't turned off when fallback happens. Now with blur turned off, the transparency doesn't get opaque until much later, causing everything to be seen through. With the animation, it makes things worse. Unless we find a better solution, let's revert this for now.

Bug: 388891313
Change-Id: I479c29cb95e4bb4cd182d996c4dcd06df051d851
parent e0677abe

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

+1 −14
Original line number Diff line number Diff line
@@ -533,10 +533,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 {
@@ -544,17 +541,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();

        }

    }