Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update content description for BP icon after auth" into udc-d1-dev am: cbce6969b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24044828

Change-Id: Ic4c656d164c4837655fd08d9d926d3cb5d6b4d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Delgado
2023-07-27 01:19:44 +00:00
committed by Automerger Merge Worker
parent 5c4b3e614f cbce6969b5
commit 566f094584
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -432,6 +432,8 @@
<string name="face_reenroll_failure_dialog_content">Couldn\u2019t set up face unlock. Go to Settings to try again.</string> <string name="face_reenroll_failure_dialog_content">Couldn\u2019t set up face unlock. Go to Settings to try again.</string>
<!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication --> <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->
<string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string> <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>
<!-- Content description after successful auth when confirmation required -->
<string name="fingerprint_dialog_authenticated_confirmation">Press the unlock icon to continue</string>
<!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] --> <!-- 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> <string name="fingerprint_dialog_use_fingerprint_instead">Can\u2019t recognize face. Use fingerprint instead.</string>
<!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] --> <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

7
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
View File

@@ -142,13 +142,18 @@ open class AuthBiometricFingerprintIconController(
STATE_IDLE, STATE_IDLE,
STATE_AUTHENTICATING_ANIMATING_IN, STATE_AUTHENTICATING_ANIMATING_IN,
STATE_AUTHENTICATING, STATE_AUTHENTICATING,
STATE_PENDING_CONFIRMATION,
STATE_AUTHENTICATED -> STATE_AUTHENTICATED ->
if (isSideFps) { if (isSideFps) {
R.string.security_settings_sfps_enroll_find_sensor_message R.string.security_settings_sfps_enroll_find_sensor_message
} else { } else {
R.string.fingerprint_dialog_touch_sensor R.string.fingerprint_dialog_touch_sensor
} }
STATE_PENDING_CONFIRMATION ->
if (isSideFps) {
R.string.security_settings_sfps_enroll_find_sensor_message
} else {
R.string.fingerprint_dialog_authenticated_confirmation
}
STATE_ERROR, STATE_ERROR,
STATE_HELP -> R.string.biometric_dialog_try_again STATE_HELP -> R.string.biometric_dialog_try_again
else -> null else -> null