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

Commit e8399452 authored by Wenhui Yang's avatar Wenhui Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix face model delete message" into udc-d1-dev am: d56f96aa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227



Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0614ef7 d56f96aa

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -744,6 +744,10 @@ 
    <string name="security_settings_face_settings_remove_dialog_details">Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern, or password to unlock your phone or for authentication in apps.</string>

    <!-- Dialog contents shown when the user removes an enrollment when configured as a convenience [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_settings_remove_dialog_details_convenience">Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your PIN, pattern, or password to unlock your phone.</string>

    <!-- Dialog contents shown when the user removes an enrollment [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_remove_dialog_details_fingerprint">Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone or for authentication in apps.</string>

    <!-- Dialog contents shown when the user removes an enrollment when configured as a convenience [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_remove_dialog_details_fingerprint_conv">Your face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone.</string>

    <!-- Subtitle shown for contextual setting face enrollment [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_settings_context_subtitle">Use Face Unlock to unlock your phone</string>

































src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java



+16
−3




























Original line number
Diff line number
Diff line








@@ -21,6 +21,7 @@ import android.app.Dialog;













import android.app.settings.SettingsEnums;















import android.content.Context;















import android.content.DialogInterface;













import android.content.pm.PackageManager;















import android.hardware.face.Face;















import android.hardware.face.FaceManager;















import android.os.Bundle;










@@ -69,10 +70,22 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference













        public Dialog onCreateDialog(Bundle savedInstanceState) {















            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());





























            builder.setTitle(R.string.security_settings_face_settings_remove_dialog_title)













                    .setMessage(mIsConvenience













            final PackageManager pm = getContext().getPackageManager();













            final boolean hasFingerprint = pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);













            final int dialogMessageRes;



























            if (hasFingerprint) {













                dialogMessageRes = mIsConvenience













                        ? R.string.security_settings_face_remove_dialog_details_fingerprint_conv













                        : R.string.security_settings_face_remove_dialog_details_fingerprint;













            } else {













                dialogMessageRes = mIsConvenience















                        ? R.string.security_settings_face_settings_remove_dialog_details_convenience













                            : R.string.security_settings_face_settings_remove_dialog_details)













                        : R.string.security_settings_face_settings_remove_dialog_details;













            }



























            builder.setTitle(R.string.security_settings_face_settings_remove_dialog_title)













                    .setMessage(dialogMessageRes)















                    .setPositiveButton(R.string.delete, mOnClickListener)















                    .setNegativeButton(R.string.cancel, mOnClickListener);















            AlertDialog dialog = builder.create();