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

Commit 68823b08 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Add missing face acquired strings 

Fixes: 123782396

Test: Builds
Change-Id: I515b7947061e6278b5b68861ef1e35aa4b3c2889
parent a30095d9

core/java/android/hardware/face/FaceManager.java

+23 −5
Original line number Diff line number Diff line
@@ -565,16 +565,16 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
     */

    public static String getErrorString(Context context, int errMsg, int vendorCode) {

        switch (errMsg) {

            case FACE_ERROR_UNABLE_TO_PROCESS:

                return context.getString(

                        com.android.internal.R.string.face_error_unable_to_process);

            case FACE_ERROR_HW_UNAVAILABLE:

                return context.getString(

                        com.android.internal.R.string.face_error_hw_not_available);

            case FACE_ERROR_NO_SPACE:

                return context.getString(com.android.internal.R.string.face_error_no_space);

            case FACE_ERROR_UNABLE_TO_PROCESS:

                return context.getString(

                        com.android.internal.R.string.face_error_unable_to_process);

            case FACE_ERROR_TIMEOUT:

                return context.getString(com.android.internal.R.string.face_error_timeout);

            case FACE_ERROR_NO_SPACE:

                return context.getString(com.android.internal.R.string.face_error_no_space);

            case FACE_ERROR_CANCELED:

                return context.getString(com.android.internal.R.string.face_error_canceled);

            case FACE_ERROR_LOCKOUT:
@@ -629,6 +629,24 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                return context.getString(R.string.face_acquired_poor_gaze);

            case FACE_ACQUIRED_NOT_DETECTED:

                return context.getString(R.string.face_acquired_not_detected);

            case FACE_ACQUIRED_TOO_MUCH_MOTION:

                return context.getString(R.string.face_acquired_too_much_motion);

            case FACE_ACQUIRED_RECALIBRATE:

                return context.getString(R.string.face_acquired_recalibrate);

            case FACE_ACQUIRED_TOO_DIFFERENT:

                return context.getString(R.string.face_acquired_too_different);

            case FACE_ACQUIRED_TOO_SIMILAR:

                return context.getString(R.string.face_acquired_too_similar);

            case FACE_ACQUIRED_PAN_TOO_EXTREME:

                return context.getString(R.string.face_acquired_pan_too_extreme);

            case FACE_ACQUIRED_TILT_TOO_EXTREME:

                return context.getString(R.string.face_acquired_tilt_too_extreme);

            case FACE_ACQUIRED_ROLL_TOO_EXTREME:

                return context.getString(R.string.face_acquired_roll_too_extreme);

            case FACE_ACQUIRED_FACE_OBSCURED:

                return context.getString(R.string.face_acquired_obscured);

            case FACE_ACQUIRED_START:

                return null;

            case FACE_ACQUIRED_VENDOR: {

                String[] msgArray = context.getResources().getStringArray(

                        R.array.face_acquired_vendor);

core/java/android/hardware/fingerprint/FingerprintManager.java

+5 −5
Original line number Diff line number Diff line
@@ -949,17 +949,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
     */

    public static String getErrorString(Context context, int errMsg, int vendorCode) {

        switch (errMsg) {

            case FINGERPRINT_ERROR_UNABLE_TO_PROCESS:

                return context.getString(

                    com.android.internal.R.string.fingerprint_error_unable_to_process);

            case FINGERPRINT_ERROR_HW_UNAVAILABLE:

                return context.getString(

                        com.android.internal.R.string.fingerprint_error_hw_not_available);

            case FINGERPRINT_ERROR_NO_SPACE:

            case FINGERPRINT_ERROR_UNABLE_TO_PROCESS:

                return context.getString(

                    com.android.internal.R.string.fingerprint_error_no_space);

                    com.android.internal.R.string.fingerprint_error_unable_to_process);

            case FINGERPRINT_ERROR_TIMEOUT:

                return context.getString(com.android.internal.R.string.fingerprint_error_timeout);

            case FINGERPRINT_ERROR_NO_SPACE:

                return context.getString(

                    com.android.internal.R.string.fingerprint_error_no_space);

            case FINGERPRINT_ERROR_CANCELED:

                return context.getString(com.android.internal.R.string.fingerprint_error_canceled);

            case FINGERPRINT_ERROR_LOCKOUT:

core/res/res/values/strings.xml

+18 −4
Original line number Diff line number Diff line
@@ -1512,7 +1512,7 @@ 
    <!-- Generic error message shown when the user has no enrolled fingerprints -->

    <string name="fingerprint_error_no_fingerprints">No fingerprints enrolled.</string>

    <!-- Generic error message shown when the app requests fingerprint authentication on a device without a sensor -->

    <string name="fingerprint_error_hw_not_present">This device does not have a fingerprint sensor</string>

    <string name="fingerprint_error_hw_not_present">This device does not have a fingerprint sensor.</string>



    <!-- Template to be used to name enrolled fingerprints by default. -->

    <string name="fingerprint_name_template">Finger <xliff:g id="fingerId" example="1">%d</xliff:g></string>
@@ -1555,8 +1555,22 @@ 
    <string name="face_acquired_poor_gaze">Please look at the sensor.</string>

    <!-- Message shown during face acquisition when the user is not detected [CHAR LIMIT=50] -->

    <string name="face_acquired_not_detected">No face detected.</string>

    <!-- Message shown during face acquisition when the face is not kept steady infront of device [CHAR LIMIT=50] -->

    <string name="face_acquired_not_steady">Keep face steady infront of device.</string>

    <!-- Message shown during face acquisition when the device is not steady [CHAR LIMIT=50] -->

    <string name="face_acquired_too_much_motion">Too much motion.</string>

    <!-- Message shown during face acquisition when the sensor needs to be recalibrated [CHAR LIMIT=50] -->

    <string name="face_acquired_recalibrate">Please re-enroll your face.</string>

    <!-- Message shown during face enrollment when a different person's face is detected [CHAR LIMIT=50] -->

    <string name="face_acquired_too_different">Different face detected.</string>

    <!-- Message shown during face enrollment when the face is too similar to a previous acquisition [CHAR LIMIT=50] -->

    <string name="face_acquired_too_similar">Too similar, please change your pose.</string>

    <!-- Message shown during acqusition when the user's face is turned too far left or right [CHAR LIMIT=50] -->

    <string name="face_acquired_pan_too_extreme">Please look more directly at the camera.</string>

    <!-- Message shown during acqusition when the user's face is tilted too high or too low [CHAR LIMIT=50] -->

    <string name="face_acquired_tilt_too_extreme">Please look more directly at the camera.</string>

    <!-- Message shown during acquisiton when the user's face is tilted too far left or right [CHAR LIMIT=50] -->

    <string name="face_acquired_roll_too_extreme">Please straighten your head vertically.</string>

    <!-- Message shown during acquisition when the user's face is obscured [CHAR LIMIT=50] -->

    <string name="face_acquired_obscured">Please uncover your face.</string>

    <!-- Array containing custom messages shown during face acquisition from vendor.  Vendor is expected to add and translate these strings -->

    <string-array name="face_acquired_vendor">

    </string-array>
@@ -1580,7 +1594,7 @@ 
    <!-- Generic error message shown when the user has no enrolled face. [CHAR LIMIT=50] -->

    <string name="face_error_not_enrolled">No face enrolled.</string>

    <!-- Generic error message shown when the app requests face authentication on a device without a sensor. [CHAR LIMIT=60] -->

    <string name="face_error_hw_not_present">This device does not have a face authentication sensor</string>

    <string name="face_error_hw_not_present">This device does not have a face authentication sensor.</string>



    <!-- Template to be used to name enrolled faces by default. [CHAR LIMIT=10] -->

    <string name="face_name_template">Face <xliff:g id="faceId" example="1">%d</xliff:g></string>

core/res/res/values/symbols.xml

+8 −0
Original line number Diff line number Diff line
@@ -2521,6 +2521,14 @@ 
  <java-symbol type="string" name="face_acquired_too_left" />

  <java-symbol type="string" name="face_acquired_poor_gaze" />

  <java-symbol type="string" name="face_acquired_not_detected" />

  <java-symbol type="string" name="face_acquired_too_much_motion" />

  <java-symbol type="string" name="face_acquired_recalibrate" />

  <java-symbol type="string" name="face_acquired_too_different" />

  <java-symbol type="string" name="face_acquired_too_similar" />

  <java-symbol type="string" name="face_acquired_pan_too_extreme" />

  <java-symbol type="string" name="face_acquired_tilt_too_extreme" />

  <java-symbol type="string" name="face_acquired_roll_too_extreme" />

  <java-symbol type="string" name="face_acquired_obscured" />

  <java-symbol type="array" name="face_acquired_vendor" />

  <java-symbol type="string" name="face_name_template" />

  <java-symbol type="string" name="face_authenticated_no_confirmation_required" />