Keyguard: Show retry text on unidentified fingerprint (88bac973) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/cm_strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -293,4 +293,7 @@
		<string name="zen_silent_with_warning">No interruptions, except alarms.</string>

		<string name="quick_settings_remove">Remove tile</string>

		<!-- Fingerprint -->
		<string name="fingerprint_try_again_hint">Please scan again</string>
		</resources>

+2 −1

Original line number	Diff line number	Diff line
		@@ -473,7 +473,8 @@ public class KeyguardViewMediator extends SystemUI {

		@Override
		public void onFingerprintAttemptFailed() {
		if (mUpdateMonitor.isMaxFingerprintAttemptsReached()) {
		if (mUpdateMonitor.isMaxFingerprintAttemptsReached()
		&& !mStatusBarKeyguardViewManager.isBouncerShowing()) {
		mStatusBarKeyguardViewManager.showBouncerHideNotifications();
		}
		userActivity();

+13 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ import android.widget.TextView;

		import com.android.internal.util.cm.LockscreenShortcutsHelper;
		import com.android.keyguard.KeyguardStatusView;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.R;
		import com.android.systemui.cm.UserContentObserver;
		import com.android.systemui.qs.QSContainer;
		@@ -351,12 +353,14 @@ public class NotificationPanelView extends PanelView implements
		public void onAttachedToWindow() {
		mSecureCameraLaunchManager.create();
		mSettingsObserver.observe();
		KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mInfoCallback);
		}

		@Override
		public void onDetachedFromWindow() {
		mSecureCameraLaunchManager.destroy();
		mSettingsObserver.unobserve();
		KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mInfoCallback);
		}

		private void startQsSizeChangeAnimation(int oldHeight, final int newHeight) {
		@@ -2112,4 +2116,13 @@ public class NotificationPanelView extends PanelView implements
		Settings.System.DOUBLE_TAP_SLEEP_GESTURE, 1, UserHandle.USER_CURRENT) == 1;
		}
		}

		private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {
		@Override
		public void onFingerprintAttemptFailed() {
		if (!mStatusBar.isBouncerShowing()) {
		NotificationPanelView.super.startHintAnimation(true /* fingerprintHint */);
		}
		}
		};
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -820,8 +820,12 @@ public abstract class PanelView extends FrameLayout {
		}



		protected void startUnlockHintAnimation() {
		startHintAnimation(false);
		}

		protected void startHintAnimation(boolean isFingerprintHint) {
		// We don't need to hint the user if an animation is already running or the user is changing
		// the expansion.
		if (mHeightAnimator != null \|\| mTracking) {
		@@ -837,7 +841,11 @@ public abstract class PanelView extends FrameLayout {
		mHintAnimationRunning = false;
		}
		});
		if (isFingerprintHint) {
		mStatusBar.onFingerprintHintStarted();
		} else {
		mStatusBar.onUnlockHintStarted();
		}
		mHintAnimationRunning = true;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -4719,6 +4719,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mKeyguardIndicationController.showTransientIndication(hint);
		}

		public void onFingerprintHintStarted() {
		mKeyguardIndicationController.showTransientIndication(R.string.fingerprint_try_again_hint);
		}

		public void onTrackingStopped(boolean expand) {
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		if (!expand && !mUnlockMethodCache.isCurrentlyInsecure()) {