diff options
5 files changed, 6 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d828f33ca514..c5aa8b05b948 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1837,6 +1837,8 @@ <string name="fingerprint_error_not_match">Fingerprint not recognized</string> <!-- Message shown when UDFPS fails to match --> <string name="fingerprint_udfps_error_not_match">Fingerprint not recognized</string> + <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] --> + <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string> <!-- Accessibility message announced when a fingerprint has been authenticated [CHAR LIMIT=NONE] --> <string name="fingerprint_authenticated">Fingerprint authenticated</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 28a9abbf88c4..0a0dc368d4a0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2610,6 +2610,7 @@ <java-symbol type="string" name="fingerprint_error_vendor_unknown" /> <java-symbol type="string" name="fingerprint_error_not_match" /> <java-symbol type="string" name="fingerprint_udfps_error_not_match" /> + <java-symbol type="string" name="fingerprint_dialog_use_fingerprint_instead" /> <java-symbol type="string" name="fingerprint_acquired_partial" /> <java-symbol type="string" name="fingerprint_acquired_insufficient" /> <java-symbol type="string" name="fingerprint_acquired_imager_dirty" /> diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 60e4cd02456b..7b288a8d49f1 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -1049,7 +1049,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, final int userId = mCurrentDialogArgs.argi1; if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) { messageRes = modality == TYPE_FACE - ? R.string.biometric_face_not_recognized + ? R.string.fingerprint_dialog_use_fingerprint_instead : R.string.fingerprint_error_not_match; } else { messageRes = R.string.biometric_not_recognized; diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt index 835ba004ffff..d054751b760b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt @@ -504,7 +504,7 @@ private class Spaghetti( modalities.hasFaceAndFingerprint && (viewModel.fingerprintStartMode.first() != FingerprintStartMode.Pending) && (authenticatedModality == BiometricModality.Face) -> - R.string.biometric_dialog_tap_confirm_with_face + R.string.biometric_dialog_tap_confirm_with_face_alt_1 else -> null } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java index bf2020bb3d37..5ce8a001ea7b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -99,7 +99,6 @@ import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.concurrency.Execution; import com.android.systemui.util.concurrency.FakeExecution; @@ -517,7 +516,7 @@ public class AuthControllerTest extends SysuiTestCase { assertThat(mModalityCaptor.getValue().intValue()).isEqualTo(modality); assertThat(mMessageCaptor.getValue()).isEqualTo( - mContext.getString(R.string.biometric_face_not_recognized)); + mContext.getString(R.string.fingerprint_dialog_use_fingerprint_instead)); } @Test |