Merge "Update deny button in permission warning dialogs" into nyc-dev

7 files changed, 10 insertions, 7 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8aed10da..eb1f38ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -162,7 +162,10 @@
         It will get access to:</string>
 
     <!-- Title for the dialog button to deny a permission grant. -->
-    <string name="grant_dialog_button_deny">Deny anyway</string>
+    <string name="grant_dialog_button_deny">Deny</string>
+
+    <!-- Title for the dialog button to deny a permission grant despite a warning of implications. -->
+    <string name="grant_dialog_button_deny_anyway">Deny anyway</string>
 
     <!-- Template for the current permission from the total number of permissions. -->
     <string name="current_permission_template">
diff --git a/src/com/android/packageinstaller/permission/ui/ConfirmActionDialogFragment.java b/src/com/android/packageinstaller/permission/ui/ConfirmActionDialogFragment.java
index fb562e2a..d6d79001 100644
--- a/src/com/android/packageinstaller/permission/ui/ConfirmActionDialogFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/ConfirmActionDialogFragment.java
@@ -46,7 +46,7 @@ public final class ConfirmActionDialogFragment extends DialogFragment {
         return new AlertDialog.Builder(getContext())
                 .setMessage(getArguments().getString(ARG_MESSAGE))
                 .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.grant_dialog_button_deny,
+                .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
index 674b562e..5ecc7ab2 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
@@ -297,7 +297,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                         .setMessage(grantedByDefault ? R.string.system_warning
                                 : R.string.old_sdk_deny_warning)
                         .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.grant_dialog_button_deny,
+                        .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                                 new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
index 563b11d7..0fb1ad52 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
@@ -351,7 +351,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
                         .setMessage(grantedByDefault ? R.string.system_warning
                                 : R.string.old_sdk_deny_warning)
                         .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.grant_dialog_button_deny,
+                        .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                                 new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java
index 4a38af96..afd2fcc5 100644
--- a/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java
@@ -293,7 +293,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                         .setMessage(grantedByDefault ? R.string.system_warning
                                 : R.string.old_sdk_deny_warning)
                         .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.grant_dialog_button_deny,
+                        .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                                 new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
index a5ef5411..5a3346fc 100644
--- a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
@@ -346,7 +346,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
                         .setMessage(grantedByDefault ? R.string.system_warning
                                 : R.string.old_sdk_deny_warning)
                         .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.grant_dialog_button_deny,
+                        .setPositiveButton(R.string.grant_dialog_button_deny_anyway,
                                 new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java b/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java
index 03713419..0800c14c 100644
--- a/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java
@@ -66,7 +66,7 @@ public final class WarningConfirmationActivity extends Activity {
 
             @Override
             public CharSequence getVerticalButton2Text() {
-                return getString(R.string.grant_dialog_button_deny);
+                return getString(R.string.grant_dialog_button_deny_anyway);
             }
 
             @Override