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

Commit ce1e8cee authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Updated power press strings in enrollment." into tm-qpr-dev

parents 12520fff 15fd6822

core/java/android/hardware/biometrics/BiometricFingerprintConstants.java

+9 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ public interface BiometricFingerprintConstants { 
            FINGERPRINT_ACQUIRED_START,

            FINGERPRINT_ACQUIRED_UNKNOWN,

            FINGERPRINT_ACQUIRED_IMMOBILE,

            FINGERPRINT_ACQUIRED_TOO_BRIGHT})

            FINGERPRINT_ACQUIRED_TOO_BRIGHT,

            FINGERPRINT_ACQUIRED_POWER_PRESSED})

    @Retention(RetentionPolicy.SOURCE)

    @interface FingerprintAcquired {}
@@ -301,6 +302,13 @@ public interface BiometricFingerprintConstants { 
     */

    int FINGERPRINT_ACQUIRED_TOO_BRIGHT = 10;



    /**

     * For sensors that have the power button co-located with their sensor, this event will

     * be sent during enrollment.

     * @hide

     */

    int FINGERPRINT_ACQUIRED_POWER_PRESSED = 11;



    /**

     * @hide

     */

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

+3 −0
Original line number Diff line number Diff line
@@ -1538,6 +1538,9 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
            case FINGERPRINT_ACQUIRED_TOO_BRIGHT:

                return context.getString(

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

            case FINGERPRINT_ACQUIRED_POWER_PRESSED:

                return context.getString(

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

            case FINGERPRINT_ACQUIRED_VENDOR: {

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

                        com.android.internal.R.array.fingerprint_acquired_vendor);

core/res/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -1708,6 +1708,8 @@ 
    <string name="fingerprint_acquired_already_enrolled">Try another fingerprint</string>

    <!-- Message shown during fingerprint acquisition when fingerprint sensor detected too much light.[CHAR LIMIT=50] -->

    <string name="fingerprint_acquired_too_bright">Too bright</string>

    <!-- Message shown during fingerprint acquisition when a Power press has been detected.[CHAR LIMIT=50] -->

    <string name="fingerprint_acquired_power_press">Power press detected</string>

    <!-- Message shown during fingerprint acquisition when a fingerprint must be adjusted.[CHAR LIMIT=50] -->

    <string name="fingerprint_acquired_try_adjusting">Try adjusting</string>

    <!-- Message shown during fingerprint acquisition when a fingeprint area has already been captured during enrollment [CHAR LIMIT=100] -->
@@ -3574,11 +3576,11 @@ 


    <!-- [CHAR LIMIT=40] Title of dialog shown to confirm device going to sleep if the power button

    is pressed during fingerprint enrollment. -->

    <string name="fp_power_button_enrollment_title">Tap to turn off screen</string>

    <string name="fp_power_button_enrollment_title">To end setup, turn off screen</string>



    <!-- [CHAR LIMIT=20] Positive button of dialog shown to confirm device going to sleep if the

    power button is pressed during fingerprint enrollment. -->

    <string name="fp_power_button_enrollment_button_text">Turn off screen</string>

    <string name="fp_power_button_enrollment_button_text">Turn off</string>



    <!-- [CHAR LIMIT=40] Title of dialog shown to confirm device going to sleep if the power button

    is pressed during biometric prompt when a side fingerprint sensor is present. -->

core/res/res/values/symbols.xml

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

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

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

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

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

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

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

services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallbackConverter.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class ClientMonitorCallbackConverter { 


    // The following apply to all clients



    void onAcquired(int sensorId, int acquiredInfo, int vendorCode) throws RemoteException {

    public void onAcquired(int sensorId, int acquiredInfo, int vendorCode) throws RemoteException {

        if (mSensorReceiver != null) {

            mSensorReceiver.onAcquired(sensorId, acquiredInfo, vendorCode);

        } else if (mFaceServiceReceiver != null) {