Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ccd3b15 authored by Wenhui Yang's avatar Wenhui Yang Committed by Android (Google) Code Review
Browse files

Merge "Update BP "Not recognized" message with UX/UI spec" into udc-qpr-dev

parents d9eed0b8 a9eef654

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,8 @@ 
    <string name="biometric_error_hw_unavailable">Biometric hardware unavailable</string>

    <!-- Message shown when biometric authentication was canceled by the user [CHAR LIMIT=50] -->

    <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] -->

    <string name="biometric_face_not_recognized">Face not recognized</string>

    <!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] -->

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+10 −2
Original line number Diff line number Diff line
@@ -1057,8 +1057,16 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    }



    private String getNotRecognizedString(@Modality int modality) {

        return mContext.getString(modality == TYPE_FACE

                ? R.string.biometric_face_not_recognized : R.string.fingerprint_error_not_match);

        final int messageRes;

        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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ public class AuthControllerTest extends SysuiTestCase { 


        assertEquals(modalityCaptor.getValue().intValue(), modality);

        assertEquals(messageCaptor.getValue(),

                mContext.getString(R.string.fingerprint_error_not_match));

                mContext.getString(R.string.biometric_not_recognized));

    }



    @Test

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

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,10 @@ public class BiometricServiceTest { 


        when(mResources.getString(R.string.biometric_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))

                .thenReturn(ERROR_NOT_RECOGNIZED);

        when(mResources.getString(R.string.biometric_error_user_canceled))