From 3f07e6589d0f036df10d97f676a375b2ce04ae3b Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Tue, 22 Mar 2016 21:36:52 -0700
Subject: Update deny button in permission warning dialogs

bug:23899558

Change-Id: I37bf080d54fc4fff5dfcc9f8240b95c82fed56d2
---
 res/values/strings.xml                                               | 5 ++++-
 .../packageinstaller/permission/ui/ConfirmActionDialogFragment.java  | 2 +-
 .../permission/ui/handheld/AppPermissionsFragment.java               | 2 +-
 .../permission/ui/handheld/PermissionAppsFragment.java               | 2 +-
 .../permission/ui/television/AppPermissionsFragment.java             | 2 +-
 .../permission/ui/television/PermissionAppsFragment.java             | 2 +-
 .../permission/ui/wear/WarningConfirmationActivity.java              | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9134d8df..c6dc6a6c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -157,7 +157,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 d5e649ee..925cacf3 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
@@ -298,7 +298,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 ccf864fb..099c78b6 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 5bb0d01c..1a078e50 100644
--- a/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java
@@ -294,7 +294,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 1f4228bb..acaadcaa 100644
--- a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
@@ -347,7 +347,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
-- 
cgit v1.2.3