diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-03-23 23:00:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-23 23:00:25 +0000 |
| commit | 32bc2d99d4e23db12d27af2c60bf060da9577c75 (patch) | |
| tree | 2e8465af61b98333f5371b123176c2075730e2df /src/com/android | |
| parent | dcc39fe43bc27412b7237195392b11299fd56ebf (diff) | |
| parent | 3f07e6589d0f036df10d97f676a375b2ce04ae3b (diff) | |
| download | android_packages_apps_PackageInstaller-32bc2d99d4e23db12d27af2c60bf060da9577c75.tar.gz android_packages_apps_PackageInstaller-32bc2d99d4e23db12d27af2c60bf060da9577c75.tar.bz2 android_packages_apps_PackageInstaller-32bc2d99d4e23db12d27af2c60bf060da9577c75.zip | |
Merge "Update deny button in permission warning dialogs" into nyc-dev
Diffstat (limited to 'src/com/android')
6 files changed, 6 insertions, 6 deletions
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 |