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

Commit fa02344f authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "faceCameraSensorPrivacy" into sc-v2-dev am: 698f40ca 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16285463

Change-Id: I9982667e2035ad3d88a614b4ed5e8d5747c42ed4
parents 6e8a545b 698f40ca

core/java/android/hardware/biometrics/BiometricConstants.java

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ public interface BiometricConstants { 
     */

    int BIOMETRIC_ERROR_RE_ENROLL = 16;



    /**

     * The privacy setting has been enabled and will block use of the sensor.

     * @hide

     */

    int BIOMETRIC_ERROR_SENSOR_PRIVACY_ENABLED = 18;



    /**

     * This constant is only used by SystemUI. It notifies SystemUI that authentication was paused

     * because the authentication attempt was unsuccessful.

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public interface BiometricFaceConstants { 
            BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL,

            BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED,

            BIOMETRIC_ERROR_RE_ENROLL,

            FACE_ERROR_UNKNOWN

            FACE_ERROR_UNKNOWN,

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface FaceError {}

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1752,6 +1752,8 @@ 
    <string name="face_setup_notification_title">Set up Face Unlock</string>

    <!-- Contents of a notification that directs the user to set up face unlock by enrolling their face. [CHAR LIMIT=NONE] -->

    <string name="face_setup_notification_content">Unlock your phone by looking at it</string>

    <!-- Error message indicating that the camera privacy sensor has been turned on [CHAR LIMIT=NONE] -->

    <string name="face_sensor_privacy_enabled">To use Face Unlock, turn on <b>Camera access</b> in Settings > Privacy</string>

    <!-- Title of a notification that directs the user to enroll a fingerprint. [CHAR LIMIT=NONE] -->

    <string name="fingerprint_setup_notification_title">Set up more ways to unlock</string>

    <!-- Contents of a notification that directs the user to enroll a fingerprint. [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2570,6 +2570,7 @@ 
  <java-symbol type="string" name="face_recalibrate_notification_name" />

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

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

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

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

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

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

packages/SystemUI/res-keyguard/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ 
    <!-- Face hint message when finger was not recognized. [CHAR LIMIT=20] -->

    <string name="kg_face_not_recognized">Not recognized</string>



     <!-- Error message indicating that the camera privacy sensor has been turned on [CHAR LIMIT=NONE] -->

    <string name="kg_face_sensor_privacy_enabled">To use Face Unlock, turn on <b>Camera access</b> in Settings > Privacy</string>



    <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->

    <plurals name="kg_password_default_pin_message">

        <item quantity="one">Enter SIM PIN. You have <xliff:g id="number">%d</xliff:g> remaining