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

Commit e147bba3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update acquisition strings"

parents ed429127 7e7b509f

core/java/android/hardware/biometrics/BiometricFaceConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public interface BiometricFaceConstants { 
    /**

     * The sensor is dirty. The user should be informed to clean the sensor.

     */

    public static final int SENSOR_DIRTY = 21;

    public static final int FACE_ACQUIRED_SENSOR_DIRTY = 21;



    /**

     * Hardware vendors may extend this list if there are conditions that do not fall under one of

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

+2 −0
Original line number Diff line number Diff line
@@ -634,6 +634,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                return context.getString(R.string.face_acquired_obscured);

            case FACE_ACQUIRED_START:

                return null;

            case FACE_ACQUIRED_SENSOR_DIRTY:

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

            case FACE_ACQUIRED_VENDOR: {

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

                        R.array.face_acquired_vendor);

core/res/res/values/strings.xml

+18 −16
Original line number Diff line number Diff line
@@ -1538,43 +1538,45 @@ 
    <string name="permdesc_useFaceAuthentication">Allows the app to use face authentication hardware for authentication</string>



    <!-- Message shown during face acquisition when the face cannot be recognized [CHAR LIMIT=50] -->

    <string name="face_acquired_insufficient">Couldn\u2019t process face. Please try again.</string>

    <string name="face_acquired_insufficient">Couldn\u2019t capture accurate face data. Try again.</string>

    <!-- Message shown during face acquisition when the image is too bright [CHAR LIMIT=50] -->

    <string name="face_acquired_too_bright">Face is too bright. Please try in lower light.</string>

    <string name="face_acquired_too_bright">Too bright. Try gentler lighting.</string>

    <!-- Message shown during face acquisition when the image is too dark [CHAR LIMIT=50] -->

    <string name="face_acquired_too_dark">Face is too dark. Please uncover light source.</string>

    <string name="face_acquired_too_dark">Too dark. Try brighter lighting.</string>

    <!-- Message shown during face acquisition when the user is too close to sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_close">Please move sensor farther from face.</string>

    <string name="face_acquired_too_close">Move phone farther away.</string>

    <!-- Message shown during face acquisition when the user is too far from sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_far">Please bring sensor closer to face.</string>

    <string name="face_acquired_too_far">Move phone closer.</string>

    <!-- Message shown during face acquisition when the user is too high relatively to sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_high">Please move sensor higher.</string>

    <string name="face_acquired_too_high">Move phone higher.</string>

    <!-- Message shown during face acquisition when the user is too low relatively to sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_low">Please move sensor lower.</string>

    <string name="face_acquired_too_low">Move phone lower.</string>

    <!-- Message shown during face acquisition when the user is too right relatively to sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_right">Please move sensor to the right.</string>

    <string name="face_acquired_too_right">Move phone to the right.</string>

    <!-- Message shown during face acquisition when the user is too left relatively to sensor [CHAR LIMIT=50] -->

    <string name="face_acquired_too_left">Please move sensor to the left.</string>

    <string name="face_acquired_too_left">Move phone to the left.</string>

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

    <string name="face_acquired_poor_gaze">Please look at the sensor.</string>

    <string name="face_acquired_poor_gaze">Look at the screen with your eyes open.</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>

    <string name="face_acquired_not_detected">Can\u2019t see your face. Look at the phone.</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>

    <string name="face_acquired_too_much_motion">Too much motion. Hold phone steady.</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>

    <string name="face_acquired_too_different">No longer able to recognize face. Try again.</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>

    <string name="face_acquired_pan_too_extreme">Please look more directly at the screen.</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>

    <string name="face_acquired_tilt_too_extreme">Please look more directly at the screen.</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>

    <string name="face_acquired_obscured">Clear the space between your head and the phone.</string>

    <!-- Message shown during acquisition when the sensor is dirty [CHAR LIMIT=50] -->

    <string name="face_acquired_sensor_dirty">Please clean the camera.</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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2546,6 +2546,7 @@ 
  <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="string" name="face_acquired_sensor_dirty" />

  <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" />