Merge cherrypicks of [15957043, 15950420, 15957044] into sc-d1-release (68ce14ff) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,9 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		: (int) MathUtils.constrain(
		MathUtils.map(.5f, .9f, 0f, 255f, expansion),
		0f, 255f);
		if (!mShowingUdfpsBouncer) {
		alpha *= (1.0f - mTransitionToFullShadeProgress);
		}
		mView.setUnpausedAlpha(alpha);
		}

+35 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,41 @@ public class UdfpsKeyguardViewControllerTest extends SysuiTestCase {
		// WHEN status bar expansion is 0 but udfps bouncer is requested
		mAltAuthInterceptor.showAlternateAuthBouncer();

		// THEN alpha is 0
		// THEN alpha is 255
		verify(mView).setUnpausedAlpha(255);
		}

		@Test
		public void testTransitionToFullShadeProgress() {
		// GIVEN view is attached and status bar expansion is 1f
		mController.onViewAttached();
		captureExpansionListeners();
		updateStatusBarExpansion(1f, true);
		reset(mView);

		// WHEN we're transitioning to the full shade
		float transitionProgress = .6f;
		mController.setTransitionToFullShadeProgress(transitionProgress);

		// THEN alpha is between 0 and 255
		verify(mView).setUnpausedAlpha((int) ((1f - transitionProgress) * 255));
		}

		@Test
		public void testShowUdfpsBouncer_transitionToFullShadeProgress() {
		// GIVEN view is attached and status bar expansion is 1f
		mController.onViewAttached();
		captureExpansionListeners();
		captureKeyguardStateControllerCallback();
		captureAltAuthInterceptor();
		updateStatusBarExpansion(1f, true);
		mAltAuthInterceptor.showAlternateAuthBouncer();
		reset(mView);

		// WHEN we're transitioning to the full shade
		mController.setTransitionToFullShadeProgress(1.0f);

		// THEN alpha is 255 (b/c udfps bouncer is requested)
		verify(mView).setUnpausedAlpha(255);
		}