From 1aa790501f5b67cc81539875d25af1965038f0c3 Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Thu, 17 Mar 2022 18:20:21 +0000
Subject: [PATCH] Update restricted setting dialog, unlock toast,  and menu
 strings

Bug: 224970895
Bug: 224992636
Bug: 224970884
Bug: 224988456

Test: Can see updated strings and toast in UI
Change-Id: I29e257fcc15310558ae8e56cbc51de3c874471ed
---
 res/values/strings.xml                        |  8 +++++---
 .../appinfo/AppInfoDashboardFragment.java     | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2d3532cc72b..80364e39d6d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4689,8 +4689,8 @@
     <string name="clear_user_data_text">Clear storage</string>
     <!-- Manage applications, restore updated system application to factory version -->
     <string name="app_factory_reset">Uninstall updates</string>
-    <!-- [CHAR LIMIT=50] Manage applications, unlock restricted settings from lock screen title -->
-    <string name="app_restricted_settings_lockscreen_title">Unlock restricted settings</string>
+    <!-- [CHAR LIMIT=50] Manage applications, unlock restricted setting from lock screen title -->
+    <string name="app_restricted_settings_lockscreen_title">Allow restricted settings</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
     <string name="auto_launch_enable_text">Some activities you\u2019ve selected open in this app by default.</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
@@ -12184,7 +12184,9 @@
     <!-- Button label to allow the user to view additional information [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=2416766240581561009] -->
     <string name="learn_more">Learn more</string>
     <!--Title for dialog displayed to tell user that settings are blocked by setting restrictions [CHAR LIMIT=50] -->
-    <string name="blocked_by_restricted_settings_title">Restricted Settings</string>
+    <string name="blocked_by_restricted_settings_title">Restricted setting</string>
+    <!--Toast message shown after the user successfully allows restricted settings [CHAR LIMIT=50] -->
+    <string name="toast_allows_restricted_settings_successfully">Restricted settings allowed for <xliff:g id="app_name" example="Gmail">%s</xliff:g></string>
     <!--Content for dialog displayed to tell user that settings are blocked by setting restrictions [CHAR LIMIT=100] -->
     <string name="blocked_by_restricted_settings_content">For your security, this setting is currently unavailable.</string>
 
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 5bc4118bfef..ac5330c4f99 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -48,6 +48,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -443,14 +444,14 @@ public class AppInfoDashboardFragment extends DashboardFragment
                     };
 
             final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context)
-                    .setTitle(context.getText(R.string.app_restricted_settings_lockscreen_title));
+                    .setUseDefaultTitle(); // use default title if title is null/empty
 
-            if (context.getSystemService(BiometricManager.class).canAuthenticate(
-                    BiometricManager.Authenticators.DEVICE_CREDENTIAL
-                            | BiometricManager.Authenticators.BIOMETRIC_WEAK)
-                    == BiometricManager.BIOMETRIC_SUCCESS) {
-                builder.setAllowedAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL
-                        | BiometricManager.Authenticators.BIOMETRIC_WEAK);
+            final BiometricManager bm = context.getSystemService(BiometricManager.class);
+            final int authenticators = BiometricManager.Authenticators.DEVICE_CREDENTIAL
+                    | BiometricManager.Authenticators.BIOMETRIC_WEAK;
+            if (bm.canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS) {
+                builder.setAllowedAuthenticators(authenticators);
+                builder.setSubtitle(bm.getStrings(authenticators).getPromptMessage());
             }
 
             final BiometricPrompt bp = builder.build();
@@ -481,6 +482,10 @@ public class AppInfoDashboardFragment extends DashboardFragment
                             getPackageName(),
                             AppOpsManager.MODE_ALLOWED);
                     getActivity().invalidateOptionsMenu();
+                    final String toastString = getContext().getString(
+                            R.string.toast_allows_restricted_settings_successfully,
+                            mAppEntry.label);
+                    Toast.makeText(getContext(), toastString, Toast.LENGTH_LONG).show();
                 });
                 return true;
         }