Fix accessibility for grant permission dialog

 - Announce properly
 - Clear button focus after selecting to avoid multiple accidental
   allows/denys

Bug: 22331950
Change-Id: Ibbe9af386c497024447cb696a94a9fbe515c91ef

2 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index 8ab7c454..95f2211f 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -186,6 +186,8 @@ public class GrantPermissionsActivity extends Activity
                 SpannableString message = new SpannableString(getString(
                         R.string.permission_warning_template, appLabel,
                         groupState.mGroup.getDescription()));
+                // Set the permission message as the title so it can be announced.
+                setTitle(message);
                 // Color the app name.
                 int appLabelStart = message.toString().indexOf(appLabel.toString(), 0);
                 int appLabelLength = appLabel.length();
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java
index b9b8828b..4e53097e 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java
@@ -144,6 +144,9 @@ final class GrantPermissionsDefaultViewHandler
         // If this is a second (or later) permission and the views exist, then animate.
         if (mIconView != null) {
             if (mGroupIndex > 0) {
+                // The first message will be announced as the title of the activity, all others
+                // we need to announce ourselves.
+                mDescContainer.announceForAccessibility(message);
                 animateToPermission();
             } else {
                 updateDescription();
@@ -356,12 +359,14 @@ final class GrantPermissionsDefaultViewHandler
         switch (view.getId()) {
             case R.id.permission_allow_button:
                 if (mResultListener != null) {
+                    view.clearAccessibilityFocus();
                     mResultListener.onPermissionGrantResult(mGroupName, true, false);
                 }
                 break;
             case R.id.permission_deny_button:
                 mAllowButton.setEnabled(true);
                 if (mResultListener != null) {
+                    view.clearAccessibilityFocus();
                     mResultListener.onPermissionGrantResult(mGroupName, false,
                             mDoNotAskCheckbox.isChecked());
                 }