From 74f7988ced18df9a06c5bf9ce7bd40505b8e6030 Mon Sep 17 00:00:00 2001
From: Joshua McCloskey <joshmccloskey@google.com>
Date: Fri, 3 Jun 2022 19:27:52 +0000
Subject: [PATCH] Update fingerprint removal dialog strings

Test: Verified manually.
Fixes: 234183857
Change-Id: I52d2ae620da40d33c13fb860200137f10e51b07d
---
 .../fingerprint/FingerprintSettings.java         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index e42574f7b6b..46ea7f42351 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -799,10 +799,12 @@ public class FingerprintSettings extends SubSettings {
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 mFp = getArguments().getParcelable(KEY_FINGERPRINT);
                 final String title = getString(R.string.fingerprint_delete_title, mFp.getName());
+                final String message =
+                        getString(R.string.fingerprint_v2_delete_message, mFp.getName());
 
                 mAlertDialog = new AlertDialog.Builder(getActivity())
                         .setTitle(title)
-                        .setMessage(R.string.fingerprint_delete_message)
+                        .setMessage(message)
                         .setPositiveButton(
                                 R.string.security_settings_fingerprint_enroll_dialog_delete,
                                 this /* onClickListener */)
@@ -967,6 +969,10 @@ public class FingerprintSettings extends SubSettings {
                 final boolean isProfileChallengeUser =
                         getArguments().getBoolean("isProfileChallengeUser");
 
+                final String title = getString(R.string.fingerprint_delete_title, mFp.getName());
+                final String message =
+                        getString(R.string.fingerprint_v2_delete_message, mFp.getName());
+
                 DevicePolicyManager devicePolicyManager =
                         getContext().getSystemService(DevicePolicyManager.class);
                 String messageId =
@@ -977,10 +983,12 @@ public class FingerprintSettings extends SubSettings {
                         : R.string.fingerprint_last_delete_message;
 
                 final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
-                        .setTitle(R.string.fingerprint_last_delete_title)
+                        .setTitle(title)
                         .setMessage(devicePolicyManager.getResources().getString(
-                                messageId, () -> getContext().getString(defaultMessageId)))
-                        .setPositiveButton(R.string.fingerprint_last_delete_confirm,
+                                messageId,
+                                () ->  message + "\n\n" + getContext().getString(defaultMessageId)))
+                        .setPositiveButton(
+                                R.string.security_settings_fingerprint_enroll_dialog_delete,
                                 new DialogInterface.OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialog, int which) {