Merge "Update behind scrim if occlusion changes" into main (97b6ae0f) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -1312,11 +1312,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		}

		// We also want to hide FLAG_SHOW_WHEN_LOCKED activities under the scrim.
		boolean hideFlagShowWhenLockedActivities =
		(mState == ScrimState.PULSING \|\| mState == ScrimState.AOD)
		&& mKeyguardOccluded;
		if (hideFlagShowWhenLockedActivities) {
		if (mState == ScrimState.PULSING \|\| mState == ScrimState.AOD) {
		if (mKeyguardOccluded) {
		mBehindAlpha = 1;
		} else {
		mBehindAlpha = 0;
		}
		}
		// Prevent notification scrim flicker when transitioning away from keyguard.
		if (mKeyguardStateController.isKeyguardGoingAway()) {

+19 −0

Original line number	Diff line number	Diff line
		@@ -1889,6 +1889,25 @@ public class ScrimControllerTest extends SysuiTestCase {
		mNotificationsScrim, TRANSPARENT));
		}

		@Test
		@DisableSceneContainer
		public void testBehindScrimSetToZeroWhenOcclusionChangesToFalse() {
		mScrimController.setKeyguardOccluded(true);
		mScrimController.legacyTransitionTo(ScrimState.AOD);
		finishAnimationsImmediately();
		assertScrimAlpha(Map.of(
		mScrimInFront, TRANSPARENT,
		mScrimBehind, OPAQUE,
		mNotificationsScrim, TRANSPARENT));

		mScrimController.setKeyguardOccluded(false);
		finishAnimationsImmediately();
		assertScrimAlpha(Map.of(
		mScrimInFront, TRANSPARENT,
		mScrimBehind, TRANSPARENT,
		mNotificationsScrim, TRANSPARENT));
		}

		@Test
		@DisableSceneContainer
		public void notificationAlpha_inKeyguardState_bouncerNotActive_clipsQsScrimFalse() {