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

Merge "Move identity check strings to framework" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-09-20 18:12:48 +00:00
committed by Android (Google) Code Review
parent 35fafa5ef4 a60540afcc
commit a0e1262ecd
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>
<!-- 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>
<!-- 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 />
<!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->
<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 String mActionIdentityCheckSettings = Settings.ACTION_SETTINGS;
private String mIdentityCheckSettingsPackageName;
@Nullable private BroadcastReceiver mBroadcastReceiver;
private boolean mShouldFinishActivity = false;
@@ -69,9 +70,11 @@ public class IdentityCheckBiometricErrorDialog extends InstrumentedDialogFragmen
final boolean twoFactorAuthentication = getArguments().getBoolean(
KEY_TWO_FACTOR_AUTHENTICATION);
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;
mIdentityCheckSettingsPackageName = getActivity().getString(
com.android.internal.R.string.identity_check_settings_package_name);
mShouldFinishActivity = getArguments().getBoolean(
KEY_FINISH_ACTIVITY);