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 am: a1306885b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940867

Change-Id: If9635147f7635fe67c4c529439c91943e364ff9f
This commit is contained in:
Mady Mellor
2021-06-14 18:32:07 +00:00
committed by Automerger Merge Worker
parent 27d0ca4bf2 a1306885b3
commit 251e6d2719
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

@@ -640,7 +640,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()) {
@@ -655,12 +655,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<Integer, Float> result = calculateBackStateForState(mState);