Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32bc2d99 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

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

parents dcc39fe4 3f07e658

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -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">

src/com/android/packageinstaller/permission/ui/ConfirmActionDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {