diff options
| author | Michael Kwan <mkwan@google.com> | 2016-10-13 00:22:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 00:22:15 +0000 |
| commit | 705be0e322f641ac7e9afbc6ff62af3661ade13e (patch) | |
| tree | 3d1a8f952608a0f005acc9806a0277906096e81e | |
| parent | adf735f3460ccb7e90c357d9946e9c0f357d6651 (diff) | |
| parent | 39520382b7c7be18ed1ba0077cf403da642999cd (diff) | |
| download | android_packages_apps_PackageInstaller-705be0e322f641ac7e9afbc6ff62af3661ade13e.tar.gz android_packages_apps_PackageInstaller-705be0e322f641ac7e9afbc6ff62af3661ade13e.tar.bz2 android_packages_apps_PackageInstaller-705be0e322f641ac7e9afbc6ff62af3661ade13e.zip | |
Update ids of permission dialogs for easier testing and automation. am: 9999019f08
am: 39520382b7
Change-Id: Ia0f54423fb3260c74e16bbe693fcfa608e826c75
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java index b50b5d83..0e46c099 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java @@ -129,7 +129,7 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand mDialog.dismiss(); mDialog = null; } - mDialog = new WearableDialogHelper.DialogBuilder(mContext) + AlertDialog alertDialog = new WearableDialogHelper.DialogBuilder(mContext) .setPositiveIcon(R.drawable.confirm_button) .setNeutralIcon(R.drawable.cancel_button) .setNegativeIcon(R.drawable.deny_button) @@ -139,7 +139,15 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand .setNeutralButton(R.string.grant_dialog_button_deny, this) .setNegativeButton(R.string.grant_dialog_button_deny_dont_ask_again, this) .show(); - mDialog.setCancelable(false); + alertDialog.setCancelable(false); + alertDialog.getButton(DialogInterface.BUTTON_POSITIVE) + .setId(R.id.permission_allow_button); + alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL) + .setId(R.id.permission_deny_button); + alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE) + .setId(R.id.permission_deny_dont_ask_again_button); + + mDialog = alertDialog; } } else { if (mDialog instanceof AcceptDenyDialog) { @@ -158,6 +166,11 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand acceptDenyDialog.setPositiveButton(this); acceptDenyDialog.setNegativeButton(this); acceptDenyDialog.show(); + acceptDenyDialog.getButton(DialogInterface.BUTTON_POSITIVE) + .setId(R.id.permission_allow_button); + acceptDenyDialog.getButton(DialogInterface.BUTTON_NEGATIVE) + .setId(R.id.permission_deny_button); + mDialog = acceptDenyDialog; mDialog.setCancelable(false); } |