Merge "Update unpaused udfps alpha when showing udfps bouncer" into sc-qpr1-dev (2747904e) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,13 @@ public class UdfpsKeyguardView extends UdfpsAnimationView {
		updateAlpha();
		}

		/**
		* @return alpha between 0 and 255
		*/
		int getUnpausedAlpha() {
		return mAlpha;
		}

		@Override
		protected int updateAlpha() {
		int alpha = super.updateAlpha();

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		pw.println("mIsBouncerVisible=" + mIsBouncerVisible);
		pw.println("mInputBouncerHiddenAmount=" + mInputBouncerHiddenAmount);
		pw.println("mStatusBarExpansion=" + mStatusBarExpansion);
		pw.println("mAlpha=" + mView.getAlpha());
		pw.println("unpausedAlpha=" + mView.getUnpausedAlpha());
		pw.println("mUdfpsRequested=" + mUdfpsRequested);
		pw.println("mView.mUdfpsRequested=" + mView.mUdfpsRequested);
		pw.println("mLaunchTransitionFadingAway=" + mLaunchTransitionFadingAway);
		@@ -178,13 +178,13 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		return false;
		}

		boolean udfpsAffordanceWasNotShowing = shouldPauseAuth();
		mShowingUdfpsBouncer = show;
		if (mShowingUdfpsBouncer) {
		mLastUdfpsBouncerShowTime = mSystemClock.uptimeMillis();
		}
		updatePauseAuth();
		if (mShowingUdfpsBouncer) {
		if (mStatusBarState == StatusBarState.SHADE_LOCKED) {
		if (udfpsAffordanceWasNotShowing) {
		mView.animateInUdfpsBouncer(null);
		}

		@@ -197,6 +197,8 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		} else {
		mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);
		}
		updateAlpha();
		updatePauseAuth();
		return true;
		}

		@@ -330,6 +332,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
		public void requestUdfps(boolean request, int color) {
		mUdfpsRequested = request;
		mView.requestUdfps(request, color);
		updateAlpha();
		updatePauseAuth();
		}

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerTest.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,25 @@ public class UdfpsKeyguardViewControllerTest extends SysuiTestCase {
		verify(mView).setUnpausedAlpha(0);
		}

		@Test
		public void testShowUdfpsBouncer() {
		// GIVEN view is attached and status bar expansion is 0
		mController.onViewAttached();
		captureExpansionListeners();
		captureKeyguardStateControllerCallback();
		captureAltAuthInterceptor();
		updateStatusBarExpansion(0, true);
		reset(mView);
		when(mView.getContext()).thenReturn(mResourceContext);
		when(mResourceContext.getString(anyInt())).thenReturn("test string");

		// WHEN status bar expansion is 0 but udfps bouncer is requested
		mAltAuthInterceptor.showAlternateAuthBouncer();

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

		private void sendStatusBarStateChanged(int statusBarState) {
		mStatusBarStateListener.onStateChanged(statusBarState);
		}