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

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

Merge "Update fingerprint error strings"

parents 615186a1 5d14cf98

core/res/res/values/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -1699,9 +1699,10 @@ 
    <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->

    <string name="fingerprint_acquired_insufficient">Couldn\'t process fingerprint. Please try again.</string>

    <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->

    <string name="fingerprint_acquired_imager_dirty">Clean the sensor</string>

    <string name="fingerprint_acquired_imager_dirty">Clean fingerprint sensor and try again</string>

    <string name="fingerprint_acquired_imager_dirty_alt">Clean sensor and try again</string>

    <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->

    <string name="fingerprint_acquired_too_fast">Hold a little longer</string>

    <string name="fingerprint_acquired_too_fast">Press firmly on the sensor</string>

    <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->

    <string name="fingerprint_acquired_too_slow">Finger moved too slow. Please try again.</string>

    <!-- Message shown during fingerprint acquisition when the fingerprint was already enrolled.[CHAR LIMIT=50] -->
@@ -1715,6 +1716,10 @@ 
    <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->

    <string-array name="fingerprint_acquired_vendor">

    </string-array>

    <!-- Message shown when fingerprint fails to match -->

    <string name="fingerprint_error_not_match">Fingerprint not recognized</string>

    <!-- Message shown when UDFPS fails to match -->

    <string name="fingerprint_udfps_error_not_match">Press firmly on the sensor</string>



    <!-- Accessibility message announced when a fingerprint has been authenticated [CHAR LIMIT=NONE] -->

    <string name="fingerprint_authenticated">Fingerprint authenticated</string>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2591,6 +2591,8 @@ 
  <java-symbol type="string" name="fingerprint_error_timeout" />

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

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

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

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

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

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

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

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

+0 −3
Original line number Diff line number Diff line
@@ -217,9 +217,6 @@ 
     the force lock button. [CHAR LIMIT=80] -->

    <string name="kg_prompt_reason_user_request">Device was locked manually</string>



    <!-- Fingerprint hint message when finger was not recognized.-->

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



    <!-- Face hint message when finger was not recognized. [CHAR LIMIT=20] -->

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

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+9 −2
Original line number Diff line number Diff line
@@ -756,8 +756,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                cb.onBiometricAuthFailed(BiometricSourceType.FINGERPRINT);

            }

        }

        if (isUdfpsSupported()) {

            handleFingerprintHelp(BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED,

                    mContext.getString(

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

        } else {

            handleFingerprintHelp(BIOMETRIC_HELP_FINGERPRINT_NOT_RECOGNIZED,

                mContext.getString(R.string.kg_fingerprint_not_recognized));

                    mContext.getString(

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

        }

    }



    private void handleFingerprintAcquired(int acquireInfo) {