Merge "Fix keyguard -> shade_locked scrim transition" into tm-qpr-dev (7ba67896) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -352,6 +352,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		.getBoolean(R.bool.notification_scrim_transparent);
		updateScrims();
		mKeyguardUpdateMonitor.registerCallback(mKeyguardVisibilityCallback);

		// prepare() sets proper initial values for most states
		for (ScrimState state : ScrimState.values()) {
		state.prepare(state);
		}
		}

		/**
		@@ -641,10 +646,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump
		private void setTransitionToFullShade(boolean transitioning) {
		if (transitioning != mTransitioningToFullShade) {
		mTransitioningToFullShade = transitioning;
		if (transitioning) {
		// Let's make sure the shade locked is ready
		ScrimState.SHADE_LOCKED.prepare(mState);
		}
		}
		}

+1 −7

Original line number	Diff line number	Diff line
		@@ -146,18 +146,12 @@ public enum ScrimState {
		mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha;
		mNotifAlpha = 1f;
		mFrontAlpha = 0f;
		mBehindTint = Color.BLACK;
		mBehindTint = mClipQsScrim ? Color.TRANSPARENT : Color.BLACK;

		if (mClipQsScrim) {
		updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);
		}
		}

		// to make sure correct color is returned before "prepare" is called
		@Override
		public int getBehindTint() {
		return Color.BLACK;
		}
		},

		/**

+15 −1

Original line number	Diff line number	Diff line
		@@ -1442,16 +1442,30 @@ public class ScrimControllerTest extends SysuiTestCase {

		@Test
		public void testNotificationTransparency_followsTransitionToFullShade() {
		mScrimController.setClipsQsScrim(true);

		mScrimController.transitionTo(SHADE_LOCKED);
		mScrimController.setRawPanelExpansionFraction(1.0f);
		finishAnimationsImmediately();

		assertScrimTinted(Map.of(
		mScrimInFront, false,
		mScrimBehind, true,
		mNotificationsScrim, false
		));

		float shadeLockedAlpha = mNotificationsScrim.getViewAlpha();
		mScrimController.transitionTo(ScrimState.KEYGUARD);
		mScrimController.setRawPanelExpansionFraction(1.0f);
		finishAnimationsImmediately();
		float keyguardAlpha = mNotificationsScrim.getViewAlpha();

		mScrimController.setClipsQsScrim(true);
		assertScrimTinted(Map.of(
		mScrimInFront, true,
		mScrimBehind, true,
		mNotificationsScrim, true
		));

		float progress = 0.5f;
		float lsNotifProgress = 0.3f;
		mScrimController.setTransitionToFullShadeProgress(progress, lsNotifProgress);