Android Autofill Accessibility, Phase I

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Handler;
 import android.support.v7.app.AlertDialog;
 import android.view.View;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.components.autofill.AutofillDelegate;
 import org.chromium.components.autofill.AutofillPopup;
 import org.chromium.components.autofill.AutofillSuggestion;
+import org.chromium.content.browser.accessibility.BrowserAccessibilityManager;
+import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.DropdownItem;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
 * JNI call glue for AutofillExternalDelagate C++ and Java objects.
 */
 @JNINamespace("autofill")
 public class AutofillPopupBridge implements AutofillDelegate, DialogInterface.OnClickListener {
     private final long mNativeAutofillPopup;
     private final AutofillPopup mAutofillPopup;
     private AlertDialog mDeletionDialog;
     private final Context mContext;
+    private BrowserAccessibilityManager mBrowserAccessibilityManager = null;
 
     public AutofillPopupBridge(View anchorView, long nativeAutofillPopupViewAndroid,
             WindowAndroid windowAndroid) {
         mNativeAutofillPopup = nativeAutofillPopupViewAndroid;
         Activity activity = windowAndroid.getActivity().get();
         if (activity == null) {
             mAutofillPopup = null;
             mContext = null;
             // Clean up the native counterpart.  This is posted to allow the native counterpart
             // to fully finish the construction of this glue object before we attempt to delete it.
             new Handler().post(new Runnable() {
                 @Override
                 public void run() {
                     dismissed();
                 }
             });
         } else {
             mAutofillPopup = new AutofillPopup(activity, anchorView, this);
             mContext = activity;
+            ChromeActivity chromeActivity = (ChromeActivity) activity;
+            ContentViewCore contentViewCore = chromeActivity.getCurrentContentViewCore();
+            mBrowserAccessibilityManager = contentViewCore.getBrowserAccessibilityManager();
         }
     }
 
     @CalledByNative
     private static AutofillPopupBridge create(View anchorView, long nativeAutofillPopupViewAndroid,
             WindowAndroid windowAndroid) {
         return new AutofillPopupBridge(anchorView, nativeAutofillPopupViewAndroid,
                 windowAndroid);
     }
 
@@ skipping 18 matching lines @@
         nativeDeletionConfirmed(mNativeAutofillPopup);
     }
 
     /**
      * Hides the Autofill Popup and removes its anchor from the ContainerView.
      */
     @CalledByNative
     private void dismiss() {
         if (mAutofillPopup != null) mAutofillPopup.dismiss();
         if (mDeletionDialog != null) mDeletionDialog.dismiss();
+        if (mBrowserAccessibilityManager != null) {
+            mBrowserAccessibilityManager.OnAutofillPopupDismissed();
+        }
     }
 
     /**
      * Shows an Autofill popup with specified suggestions.
      * @param suggestions Autofill suggestions to be displayed.
      * @param isRtl @code true if right-to-left text.
      * @param backgroundColor popup background color, or {@code Color.TRANSPARENT} if not specified
      * in experiment.
      * @param dividerColor color for divider between popup items, or {@code Color.TRANSPARENT} if
      * not specified in experiment.
      * @param dropdownItemHeight height of each dropdown item in dimension independent pixel units,
      * 0 if not specified in experiment.
      * @param margin Margin for icon, label and between icon and label in dimension independent
      * pixel units, 0 if not specified in experiment.
      */
     @CalledByNative
     private void show(AutofillSuggestion[] suggestions, boolean isRtl, int backgroundColor,
             int dividerColor, int dropdownItemHeight, int margin) {
-        if (mAutofillPopup != null) mAutofillPopup.filterAndShow(suggestions, isRtl,
-                backgroundColor, dividerColor, dropdownItemHeight, margin);
+        if (mAutofillPopup != null) {
+            mAutofillPopup.filterAndShow(
+                    suggestions, isRtl, backgroundColor, dividerColor, dropdownItemHeight, margin);
+            if (mBrowserAccessibilityManager != null) {
+                mBrowserAccessibilityManager.OnAutofillPopupDisplayed();

[dmazzoni, 2017/03/22 16:13:54]

Would it make sense to pass the pop-up View to BrowserAccessibilityManager here?

[csashi, 2017/03/24 01:32:23]

Done.

+            }
+        }
     }
 
     @CalledByNative
     private void confirmDeletion(String title, String body) {
         mDeletionDialog = new AlertDialog.Builder(mContext, R.style.AlertDialogTheme)
                 .setTitle(title)
                 .setMessage(body)
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.ok, this)
                 .create();
@@ skipping 29 matching lines @@
                 suggestionId, isDeletable, isLabelMultiline, isLabelBold);
     }
 
     private native void nativeSuggestionSelected(long nativeAutofillPopupViewAndroid,
             int listIndex);
     private native void nativeDeletionRequested(long nativeAutofillPopupViewAndroid,
             int listIndex);
     private native void nativeDeletionConfirmed(long nativeAutofillPopupViewAndroid);
     private native void nativePopupDismissed(long nativeAutofillPopupViewAndroid);
 }