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

Merge "Scrim: Normalize behind scrim when unoccluding." into tm-dev

Browse Source
This commit is contained in:
Aaron Liu
2022-03-31 00:31:20 +00:00
committed by Android (Google) Code Review
parent 1b284d865f 93fa7d6115
commit 6cde647fe3
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -858,6 +858,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
// We're unoccluding the keyguard and don't want to have a bright flash.
mNotificationsAlpha = ScrimState.KEYGUARD.getNotifAlpha();
mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();
mBehindAlpha = ScrimState.KEYGUARD.getBehindAlpha();
mBehindTint = ScrimState.KEYGUARD.getBehindTint();
}
}
if (mState != ScrimState.UNLOCKED) {

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

@@ -122,7 +122,6 @@ public class ScrimControllerTest extends SysuiTestCase {
@Mock
private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
private static class AnimatorListener implements Animator.AnimatorListener {
private int mNumStarts;
private int mNumEnds;
@@ -1369,6 +1368,21 @@ public class ScrimControllerTest extends SysuiTestCase {
}
@Test
public void setUnOccludingAnimationKeyguard() {
mScrimController.setUnocclusionAnimationRunning(true);
mScrimController.transitionTo(ScrimState.KEYGUARD);
finishAnimationsImmediately();
assertThat(mNotificationsScrim.getViewAlpha())
.isWithin(0.01f).of(ScrimState.KEYGUARD.getNotifAlpha());
assertThat(mNotificationsScrim.getTint())
.isEqualTo(ScrimState.KEYGUARD.getNotifTint());
assertThat(mScrimBehind.getViewAlpha())
.isWithin(0.01f).of(ScrimState.KEYGUARD.getBehindAlpha());
assertThat(mScrimBehind.getTint())
.isEqualTo(ScrimState.KEYGUARD.getBehindTint());
}
private void assertAlphaAfterExpansion(ScrimView scrim, float expectedAlpha, float expansion) {
mScrimController.setRawPanelExpansionFraction(expansion);
finishAnimationsImmediately();