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

Move identity check strings to framework

Browse Source 
Flag: android.hardware.biometrics.flag.mandatory_biometrics
Bug: 358641110
Bug: 358179610
Test: Manual

Change-Id: I8f9cc16a0ffc43655534663203ff4da6380fbc97
This commit is contained in:
Diya Bera
2024-09-19 23:04:34 +00:00
parent 6c584d7f42
commit a60540afcc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -960,8 +960,6 @@
<string name="go_to_identity_check">Go to identity check</string> <string name="go_to_identity_check">Go to identity check</string>
<!-- Biometric error dialog button text to lock screen and recover biometric lockout state. [CHAR LIMIT=60] --> <!-- Biometric error dialog button text to lock screen and recover biometric lockout state. [CHAR LIMIT=60] -->
<string name="identity_check_lockout_error_lock_screen">Lock screen</string> <string name="identity_check_lockout_error_lock_screen">Lock screen</string>
<!-- Action for opening identity check settings page [CHAR LIMIT=NONE] [DO NOT TRANSLATE] -->
<string name="identity_check_settings_action"></string>
<!-- RemoteAuth unlock enrollment and settings --><skip /> <!-- RemoteAuth unlock enrollment and settings --><skip />
<!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] --> <!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->
<string name ="security_settings_remoteauth_preference_title">Remote Authenticator Unlock</string> <string name ="security_settings_remoteauth_preference_title">Remote Authenticator Unlock</string>

5
src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java
View File

@@ -53,6 +53,7 @@ public class IdentityCheckBiometricErrorDialog extends InstrumentedDialogFragmen
private static final String KEY_FINISH_ACTIVITY = "key_finish_activity"; private static final String KEY_FINISH_ACTIVITY = "key_finish_activity";
private String mActionIdentityCheckSettings = Settings.ACTION_SETTINGS; private String mActionIdentityCheckSettings = Settings.ACTION_SETTINGS;
private String mIdentityCheckSettingsPackageName;
@Nullable private BroadcastReceiver mBroadcastReceiver; @Nullable private BroadcastReceiver mBroadcastReceiver;
private boolean mShouldFinishActivity = false; private boolean mShouldFinishActivity = false;
@@ -69,9 +70,11 @@ public class IdentityCheckBiometricErrorDialog extends InstrumentedDialogFragmen
final boolean twoFactorAuthentication = getArguments().getBoolean( final boolean twoFactorAuthentication = getArguments().getBoolean(
KEY_TWO_FACTOR_AUTHENTICATION); KEY_TWO_FACTOR_AUTHENTICATION);
final String identityCheckSettingsAction = getActivity().getString( final String identityCheckSettingsAction = getActivity().getString(
R.string.identity_check_settings_action); com.android.internal.R.string.identity_check_settings_action);
mActionIdentityCheckSettings = identityCheckSettingsAction.isEmpty() mActionIdentityCheckSettings = identityCheckSettingsAction.isEmpty()
? mActionIdentityCheckSettings : identityCheckSettingsAction; ? mActionIdentityCheckSettings : identityCheckSettingsAction;
mIdentityCheckSettingsPackageName = getActivity().getString(
com.android.internal.R.string.identity_check_settings_package_name);
mShouldFinishActivity = getArguments().getBoolean( mShouldFinishActivity = getArguments().getBoolean(
KEY_FINISH_ACTIVITY); KEY_FINISH_ACTIVITY);