From be27e5e9f69ddae25d8b5f0a5da9c20916cf9c0f Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 10 Jun 2021 16:11:07 -0700 Subject: Fix shade not having a background when opened on an expanded bubble Test: atest ScrimControllerTest Test: manual - expand a bubble, pull down the shade, observe that the shade is opaque. Bug: 187463627 Change-Id: Ib2e86bccab3a74506be0213d2553e698977ce564 --- .../src/com/android/systemui/statusbar/phone/ScrimController.java | 8 +------- 1 file changed, 1 insertion(+), 7 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 1331829201b8..7a1e5cf1770b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -642,7 +642,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump return; } - if (mState == ScrimState.UNLOCKED) { + if (mState == ScrimState.UNLOCKED || mState == ScrimState.BUBBLE_EXPANDED) { // Darken scrim as you pull down the shade when unlocked, unless the shade is expanding // because we're doing the screen off animation. if (!mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) { @@ -657,12 +657,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump } mInFrontAlpha = 0; } - } else if (mState == ScrimState.BUBBLE_EXPANDED) { - // Darken scrim as you pull down the shade when unlocked - float behindFraction = getInterpolatedFraction(); - behindFraction = (float) Math.pow(behindFraction, 0.8f); - mBehindAlpha = behindFraction * mDefaultScrimAlpha; - mInFrontAlpha = 0; } else if (mState == ScrimState.KEYGUARD || mState == ScrimState.SHADE_LOCKED || mState == ScrimState.PULSING) { Pair result = calculateBackStateForState(mState); -- cgit v1.2.3-59-g8ed1b