diff options
author | Austin Delgado <austindelgado@google.com> | 2023-08-11 11:10:08 -0700 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-13 15:00:56 +0000 |
commit | 8762a4607896ff235493fbd9529c9989fdafbad6 (patch) | |
tree | ee27d837c885bd8776eef58d6b5b19b316cadae5 | |
parent | c80b605433007ce77d1f0ca350b09a8871d5cf7b (diff) | |
download | base-8762a4607896ff235493fbd9529c9989fdafbad6.tar.gz |
Update BP strings
Updates the BP strings for unlock error and unlock succeeded
Bug: 291960666
Test: atest SystemUITests:com.android.systemui.biometrics
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98cbf05bda481c0420f02d15d6ba36043883861a)
Merged-In: I914d2d0418a741e1764418f71461e8bf00567bde
Change-Id: I914d2d0418a741e1764418f71461e8bf00567bde
5 files changed, 8 insertions, 5 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 79426c8311ab..dfff8d4d28ff 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1835,6 +1835,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 cafa74e7250b..4213190a4ac2 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2591,6 +2591,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 96b144731a1b..2ca4f0cfe3b1 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -88,6 +88,8 @@ import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.concurrency.Execution; +import kotlin.Unit; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; @@ -101,7 +103,6 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Provider; -import kotlin.Unit; import kotlinx.coroutines.CoroutineScope; /** @@ -1036,7 +1037,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 d4643f4eaaff..1bf7ffa8cff6 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 @@ -485,7 +485,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 0a73a9eba9ee..8278135b2f9f 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; @@ -515,7 +514,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 |