Merge "Remove concept of backdrop" into main (9e65fb47) · Commits · e / os / android_frameworks_base

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -1715,26 +1715,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		updateScrims();
		}

		public void setHasBackdrop(boolean hasBackdrop) {
		for (ScrimState state : ScrimState.values()) {
		state.setHasBackdrop(hasBackdrop);
		}

		// Backdrop event may arrive after state was already applied,
		// in this case, back-scrim needs to be re-evaluated
		if (mState == ScrimState.AOD \|\| mState == ScrimState.PULSING) {
		float newBehindAlpha = mState.getBehindAlpha();
		if (isNaN(newBehindAlpha)) {
		throw new IllegalStateException("Scrim opacity is NaN for state: " + mState
		+ ", back: " + mBehindAlpha);
		}
		if (mBehindAlpha != newBehindAlpha) {
		mBehindAlpha = newBehindAlpha;
		updateScrims();
		}
		}
		}

		private void setKeyguardFadingAway(boolean fadingAway, long duration) {
		for (ScrimState state : ScrimState.values()) {
		state.setKeyguardFadingAway(fadingAway, duration);

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

+1 −6

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ public enum ScrimState {

		@Override
		public float getMaxLightRevealScrimAlpha() {
		return mWallpaperSupportsAmbientMode && !mHasBackdrop ? 0f : 1f;
		return mWallpaperSupportsAmbientMode ? 0f : 1f;
		}

		@Override
		@@ -369,7 +369,6 @@ public enum ScrimState {
		DockManager mDockManager;
		boolean mDisplayRequiresBlanking;
		boolean mWallpaperSupportsAmbientMode;
		boolean mHasBackdrop;
		boolean mLaunchingAffordanceWithPreview;
		boolean mOccludeAnimationPlaying;
		boolean mWakeLockScreenSensorActive;
		@@ -489,10 +488,6 @@ public enum ScrimState {
		return false;
		}

		public void setHasBackdrop(boolean hasBackdrop) {
		mHasBackdrop = hasBackdrop;
		}

		public void setWakeLockScreenSensorActive(boolean active) {
		mWakeLockScreenSensorActive = active;
		}

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

+0 −44

Original line number	Diff line number	Diff line
		@@ -309,8 +309,6 @@ public class ScrimControllerTest extends SysuiTestCase {
		// Attach behind scrim so flows that are collecting on it start running.
		ViewUtils.attachView(mScrimBehind);

		mScrimController.setHasBackdrop(false);

		mWallpaperRepository.getWallpaperSupportsAmbientMode().setValue(false);
		mTestScope.getTestScheduler().runCurrent();

		@@ -482,47 +480,6 @@ public class ScrimControllerTest extends SysuiTestCase {
		assertEquals(0f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);
		}

		@Test
		public void transitionToAod_withAodWallpaperAndLockScreenWallpaper() {
		mScrimController.setHasBackdrop(true);
		mWallpaperRepository.getWallpaperSupportsAmbientMode().setValue(true);
		mTestScope.getTestScheduler().runCurrent();

		mScrimController.legacyTransitionTo(ScrimState.AOD);
		finishAnimationsImmediately();

		assertScrimAlpha(Map.of(
		mScrimInFront, TRANSPARENT,
		mScrimBehind, TRANSPARENT));
		assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);

		assertScrimTinted(Map.of(
		mScrimInFront, true,
		mScrimBehind, true
		));
		}

		@Test
		public void setHasBackdrop_withAodWallpaperAndAlbumArt() {
		mWallpaperRepository.getWallpaperSupportsAmbientMode().setValue(true);
		mTestScope.getTestScheduler().runCurrent();

		mScrimController.legacyTransitionTo(ScrimState.AOD);
		finishAnimationsImmediately();
		mScrimController.setHasBackdrop(true);
		finishAnimationsImmediately();

		assertScrimAlpha(Map.of(
		mScrimInFront, TRANSPARENT,
		mScrimBehind, TRANSPARENT));
		assertEquals(1f, mScrimController.getState().getMaxLightRevealScrimAlpha(), 0f);

		assertScrimTinted(Map.of(
		mScrimInFront, true,
		mScrimBehind, true
		));
		}

		@Test
		public void transitionToAod_withFrontAlphaUpdates() {
		// Assert that setting the AOD front scrim alpha doesn't take effect in a non-AOD state.
		@@ -1356,7 +1313,6 @@ public class ScrimControllerTest extends SysuiTestCase {
		mScrimController.setScrimVisibleListener(visible -> mScrimVisibility = visible);
		mScrimController.attachViews(mScrimBehind, mNotificationsScrim, mScrimInFront);
		mScrimController.setAnimatorListener(mAnimatorListener);
		mScrimController.setHasBackdrop(false);
		mWallpaperRepository.getWallpaperSupportsAmbientMode().setValue(false);
		mTestScope.getTestScheduler().runCurrent();
		mScrimController.legacyTransitionTo(ScrimState.KEYGUARD);