PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update string for acquire msg FINGERPRINT_ACQUIRED_IMAGER_DIRTY on UDFPS devices" into main

Browse Source
This commit is contained in:
Vincent Wang
2024-04-11 08:55:07 +00:00
committed by Android (Google) Code Review
parent f83b076d66 a38a05769a
commit 7c33a5ceae
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -13183,4 +13183,7 @@
<string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string> <string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string>
<!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] --> <!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
<string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string> <string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string>
<!--Text for acquire msg on UDFPS devices -->
<string name="fingerprint_acquired_imager_dirty_udfps">Clean your screen near the sensor and try again</string>
</resources> </resources>

8
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint; package com.android.settings.biometrics.fingerprint;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMAGER_DIRTY;
import static android.text.Layout.HYPHENATION_FREQUENCY_NONE; import static android.text.Layout.HYPHENATION_FREQUENCY_NONE;
import android.animation.Animator; import android.animation.Animator;
@@ -770,10 +771,15 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
@Override @Override
public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) { public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
final CharSequence featuredString = mCanAssumeSfps CharSequence featuredString = mCanAssumeSfps
? mSfpsEnrollmentFeature.getFeaturedVendorString(this, helpMsgId, helpString) ? mSfpsEnrollmentFeature.getFeaturedVendorString(this, helpMsgId, helpString)
: helpString; : helpString;
if (helpMsgId == FINGERPRINT_ACQUIRED_IMAGER_DIRTY && mCanAssumeUdfps) {
featuredString = getResources().getString(
R.string.fingerprint_acquired_imager_dirty_udfps);
}
if (!TextUtils.isEmpty(featuredString)) { if (!TextUtils.isEmpty(featuredString)) {
if (!(mCanAssumeUdfps || mCanAssumeSfps)) { if (!(mCanAssumeUdfps || mCanAssumeSfps)) {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);