Merge "Merge "Hide lock icon while WAKE_AND_UNLOCK is happening." into qt-dev... (ccc3303f) · Commits · e / os / android_frameworks_base

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

+22 −1

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
		private float mDozeAmount;
		private int mIconRes;
		private boolean mWasPulsingOnThisFrame;
		private boolean mWakeAndUnlockRunning;

		private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);
		private final DockManager.DockEventListener mDockEventListener =
		@@ -277,7 +278,8 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
		mLastBouncerVisible = mBouncerVisible;
		}

		boolean invisible = mDozing && (!mPulsing \|\| mDocked);
		boolean onAodNotPulsingOrDocked = mDozing && (!mPulsing \|\| mDocked);
		boolean invisible = onAodNotPulsingOrDocked \|\| mWakeAndUnlockRunning;
		setVisibility(invisible ? INVISIBLE : VISIBLE);
		updateClickability();
		}
		@@ -450,4 +452,23 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
		public void onUnlockMethodStateChanged() {
		update();
		}

		/**
		* We need to hide the lock whenever there's a fingerprint unlock, otherwise you'll see the
		* icon on top of the black front scrim.
		*/
		public void onBiometricAuthModeChanged(boolean wakeAndUnlock) {
		if (wakeAndUnlock) {
		mWakeAndUnlockRunning = true;
		}
		update();
		}

		/**
		* Triggered after the unlock animation is over and the user is looking at launcher.
		*/
		public void onKeyguardFadedAway() {
		mWakeAndUnlockRunning = false;
		update();
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -538,6 +538,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		if (mKeyguardMonitor.isKeyguardFadingAway()) {
		mStatusBarKeyguardViewManager.onKeyguardFadedAway();
		mStatusBarWindow.onKeyguardFadedAway();
		}
		}

		@@ -3798,6 +3799,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		public void notifyBiometricAuthModeChanged() {
		updateDozing();
		updateScrimController();
		mStatusBarWindow.onBiometricAuthModeChanged(mBiometricUnlockController.isWakeAndUnlock());
		}

		@VisibleForTesting

+15 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,21 @@ public class StatusBarWindowView extends FrameLayout {
		mLockIcon.setPulsing(pulsing);
		}

		/**
		* Called when the biometric authentication mode changes.
		* @param wakeAndUnlock If the type is {@link BiometricUnlockController#isWakeAndUnlock()}
		*/
		public void onBiometricAuthModeChanged(boolean wakeAndUnlock) {
		mLockIcon.onBiometricAuthModeChanged(wakeAndUnlock);
		}

		/**
		* Called after finished unlocking and the status bar window is already collapsed.
		*/
		public void onKeyguardFadedAway() {
		mLockIcon.onKeyguardFadedAway();
		}

		public void setStatusBarView(PhoneStatusBarView statusBarView) {
		mStatusBarView = statusBarView;
		}

+1 −1

File changed.

Contains only whitespace changes.