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

Commit a60540af authored by Diya Bera's avatar Diya Bera
Browse files

Move identity check strings to framework 

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

Change-Id: I8f9cc16a0ffc43655534663203ff4da6380fbc97
parent 6c584d7f

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/biometrics/IdentityCheckBiometricErrorDialog.java

+4 −1
Original line number Diff line number Diff line
@@ -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);