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

Update BP "Not recognized" message with UX/UI spec

Browse Source 
Change the string on the biometric prompt when fingerprint/face failed
according to biometric enrollment status

Fixes: 286993443
Fixes: 286967857
Test: Manual (see bug)
Test: atest AuthControllerTest atest BiometricsServiceTest
Change-Id: Ieaecf678d9498b065972340900ddb5afba97ac1e
This commit is contained in:
Wenhui Yang
2023-06-15 22:53:32 +00:00
parent c168df1ff1
commit a9eef654d2
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -1787,6 +1787,8 @@
<string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string> <string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string>
<!-- Message shown when biometric authentication was canceled by the user [CHAR LIMIT=50] --> <!-- Message shown when biometric authentication was canceled by the user [CHAR LIMIT=50] -->
<string name="biometric_error_user_canceled">Authentication canceled</string> <string name="biometric_error_user_canceled">Authentication canceled</string>
<!-- Message shown by the biometric dialog when biometric is not recognized -->
<string name="biometric_not_recognized">Not recognized</string>
<!-- Message shown by the biometric dialog when face is not recognized [CHAR LIMIT=50] --> <!-- Message shown by the biometric dialog when face is not recognized [CHAR LIMIT=50] -->
<string name="biometric_face_not_recognized">Face not recognized</string> <string name="biometric_face_not_recognized">Face not recognized</string>
<!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] --> <!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] -->

12
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -1057,8 +1057,16 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
} }
private String getNotRecognizedString(@Modality int modality) { private String getNotRecognizedString(@Modality int modality) {
return mContext.getString(modality == TYPE_FACE final int messageRes;
? R.string.biometric_face_not_recognized : R.string.fingerprint_error_not_match); final int userId = mCurrentDialogArgs.argi1;
if (isFaceAuthEnrolled(userId) && isFingerprintEnrolled(userId)) {
messageRes = modality == TYPE_FACE
? R.string.biometric_face_not_recognized
: R.string.fingerprint_error_not_match;
} else {
messageRes = R.string.biometric_not_recognized;
}
return mContext.getString(messageRes);
} }
private String getErrorString(@Modality int modality, int error, int vendorCode) { private String getErrorString(@Modality int modality, int error, int vendorCode) {

2
packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java
View File

@@ -488,7 +488,7 @@ public class AuthControllerTest extends SysuiTestCase {
assertEquals(modalityCaptor.getValue().intValue(), modality); assertEquals(modalityCaptor.getValue().intValue(), modality);
assertEquals(messageCaptor.getValue(), assertEquals(messageCaptor.getValue(),
mContext.getString(R.string.fingerprint_error_not_match)); mContext.getString(R.string.biometric_not_recognized));
} }
@Test @Test

4
services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java
View File

@@ -181,6 +181,10 @@ public class BiometricServiceTest {
when(mResources.getString(R.string.biometric_error_hw_unavailable)) when(mResources.getString(R.string.biometric_error_hw_unavailable))
.thenReturn(ERROR_HW_UNAVAILABLE); .thenReturn(ERROR_HW_UNAVAILABLE);
when(mResources.getString(R.string.biometric_not_recognized))
.thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.biometric_face_not_recognized))
.thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.fingerprint_error_not_match)) when(mResources.getString(R.string.fingerprint_error_not_match))
.thenReturn(ERROR_NOT_RECOGNIZED); .thenReturn(ERROR_NOT_RECOGNIZED);
when(mResources.getString(R.string.biometric_error_user_canceled)) when(mResources.getString(R.string.biometric_error_user_canceled))