Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bffcd18a authored Jul 08, 2022 by Aaron Liu Committed by Automerger Merge Worker Jul 08, 2022

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

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>

parents b091a934 2ae06d9b

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -783,7 +783,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		mInFrontAlpha = 0;
		}

		if (mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) {
		if (mState == ScrimState.DREAMING
		&& mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) {
		final float interpolatedFraction =
		BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(
		mBouncerHiddenFraction);

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -1553,6 +1553,15 @@ public class ScrimControllerTest extends SysuiTestCase {
		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) {
		mScrimController.setRawPanelExpansionFraction(expansion);
		finishAnimationsImmediately();