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

Merge "[Keyguard] Remove behind scrim for alarm" into tm-qpr-dev am: 2ae06d9b9b

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

Change-Id: I272b7ef7cf07ad4ee1ff9be92ea7cddf60e1ac40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-07-08 22:41:46 +00:00
committed by Automerger Merge Worker
parent b091a9349f 2ae06d9b9b
commit bffcd18a9e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -783,7 +783,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
mInFrontAlpha = 0; mInFrontAlpha = 0;
} }
if (mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) { if (mState == ScrimState.DREAMING
&& mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) {
final float interpolatedFraction = final float interpolatedFraction =
BouncerPanelExpansionCalculator.aboutToShowBouncerProgress( BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(
mBouncerHiddenFraction); mBouncerHiddenFraction);

9
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
View File

@@ -1553,6 +1553,15 @@ public class ScrimControllerTest extends SysuiTestCase {
mScrimInFront.shouldBlendWithMainColor()); mScrimInFront.shouldBlendWithMainColor());
} }
@Test
public void applyState_unlocked_bouncerShowing() {
mScrimController.transitionTo(ScrimState.UNLOCKED);
mScrimController.setBouncerHiddenFraction(0.99f);
mScrimController.setRawPanelExpansionFraction(0f);
finishAnimationsImmediately();
assertScrimAlpha(mScrimBehind, 0);
}
private void assertAlphaAfterExpansion(ScrimView scrim, float expectedAlpha, float expansion) { private void assertAlphaAfterExpansion(ScrimView scrim, float expectedAlpha, float expansion) {
mScrimController.setRawPanelExpansionFraction(expansion); mScrimController.setRawPanelExpansionFraction(expansion);
finishAnimationsImmediately(); finishAnimationsImmediately();