Merge "Move identity check strings to framework" into main
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 32c872b..c586c3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
diff --git a/src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java b/src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java
index a4b10fc..a5fe49e 100644
--- a/src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java
+++ b/src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java
@@ -53,6 +53,7 @@
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 @@
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);