Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix shade not having a background when opened on an expanded bubble" into sc-dev

Browse Source
This commit is contained in:
Mady Mellor
2021-06-14 18:16:16 +00:00
committed by Android (Google) Code Review
parent ff8bdd8808 be27e5e9f6
commit a1306885b3
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -642,7 +642,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
return; 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 // Darken scrim as you pull down the shade when unlocked, unless the shade is expanding
// because we're doing the screen off animation. // because we're doing the screen off animation.
if (!mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) { if (!mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {
@@ -657,12 +657,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
} }
mInFrontAlpha = 0; 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 } else if (mState == ScrimState.KEYGUARD || mState == ScrimState.SHADE_LOCKED
|| mState == ScrimState.PULSING) { || mState == ScrimState.PULSING) {
Pair<Integer, Float> result = calculateBackStateForState(mState); Pair<Integer, Float> result = calculateBackStateForState(mState);