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

Commit 48ac7eba authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Android (Google) Code Review
Browse files

Merge "Tweak strings for traffic light face enrollment" into sc-dev

parents 8bea4374 b7bc5bce

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

+8 −4
Original line number Diff line number Diff line
@@ -1448,13 +1448,17 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
            case FACE_ACQUIRED_TOO_FAR:

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

            case FACE_ACQUIRED_TOO_HIGH:

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

            case FACE_ACQUIRED_TOO_LOW:

                // TODO(b/181269243): Change back once error codes are fixed.

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

            case FACE_ACQUIRED_TOO_LOW:

                // TODO(b/181269243) Change back once error codes are fixed.

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

            case FACE_ACQUIRED_TOO_RIGHT:

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

            case FACE_ACQUIRED_TOO_LEFT:

                // TODO(b/181269243) Change back once error codes are fixed.

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

            case FACE_ACQUIRED_TOO_LEFT:

                // TODO(b/181269243) Change back once error codes are fixed.

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

            case FACE_ACQUIRED_POOR_GAZE:

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

            case FACE_ACQUIRED_NOT_DETECTED:

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ 
    <!-- 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">Turn your head a little less.</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">Turn your head a little less.</string>

    <string name="face_acquired_tilt_too_extreme">Tilt your head a little less.</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">Turn your head a little less.</string>

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