commit 9999019f0801cf45ba296c5e4f39dc2338fe9cd0
author Michael Kwan <mkwan@google.com> Wed Oct 12 15:43:18 2016 -0700
committer Michael Kwan <mkwan@google.com> Wed Oct 12 15:43:18 2016 -0700
tree 4d452bf9bbd446a92bceee0eea42d0c151028be5
parent c087334878c685df0adb80bdd2c8a1c41439ac2c

Update ids of permission dialogs for easier testing and automation.

Bug: 31779188
Change-Id: I41aecafefaeaaa15f70f43334df3ff367b3a312c

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

diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
index b50b5d8..0e46c09 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java
@@ -129,7 +129,7 @@
                     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 @@
                         .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 @@
                 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);
             }