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

Commit 25602619 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use 0.2f as the behind scrim alpha when keyguard or glanceable hub... 

Merge "Use 0.2f as the behind scrim alpha when keyguard or glanceable hub widgets screen is open" into main
parents fe9ee5b6 fb81eaeb

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

+4 −4
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ public enum ScrimState { 
                mAnimationDuration = ScrimController.ANIMATION_DURATION;

            }

            if (Flags.notificationShadeBlur()) {

                mBehindTint = Color.TRANSPARENT;

                mBehindTint = mBackgroundColor;

                mNotifTint = mNotificationScrimColor;

                mBehindAlpha = 0.0f;

                mBehindAlpha = mScrimBehindAlphaKeyguard;

                mNotifAlpha = 0.0f;

                mFrontAlpha = 0.0f;

            } else {
@@ -433,9 +433,9 @@ public enum ScrimState { 
        public void prepare(ScrimState previousState) {

            if (Flags.notificationShadeBlur()) {

                // Scrim parameters should match KEYGUARD as we're showing on top of keyguard.

                mBehindTint = Color.TRANSPARENT;

                mBehindTint = mBackgroundColor;

                mNotifTint = mNotificationScrimColor;

                mBehindAlpha = 0.0f;

                mBehindAlpha = mScrimBehindAlphaKeyguard;

                mNotifAlpha = 0.0f;

                mFrontAlpha = 0.0f;

            } else {