Merge "Remove scrim animation between AOD and OFF" into 24D1-dev (a354b1cc) · Commits · e / os / android_frameworks_base

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -46,8 +46,12 @@ public enum ScrimState {
		mFrontAlpha = 1f;
		mBehindAlpha = 1f;

		if (previousState == AOD) {
		mAnimateChange = false;
		} else {
		mAnimationDuration = ScrimController.ANIMATION_DURATION_LONG;
		}
		}

		@Override
		public boolean isLowPowerState() {
		@@ -193,12 +197,16 @@ public enum ScrimState {
		mBehindAlpha = ScrimController.TRANSPARENT;

		mAnimationDuration = ScrimController.ANIMATION_DURATION_LONG;
		// DisplayPowerManager may blank the screen for us, or we might blank it for ourselves
		// by animating the screen off via the LightRevelScrim. In either case we just need to
		if (previousState == OFF) {
		mAnimateChange = false;
		} else {
		// DisplayPowerManager may blank the screen for us, or we might blank it by
		// animating the screen off via the LightRevelScrim. In either case we just need to
		// set our state.
		mAnimateChange = mDozeParameters.shouldControlScreenOff()
		&& !mDozeParameters.shouldShowLightRevealScrim();
		}
		}

		@Override
		public float getMaxLightRevealScrimAlpha() {