Android Autofill Accessibility, Phase I

content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java

Index: content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
index 6d63ded0c148b0b4c088d373b9af02707346af15..3a052973fdc5785c35ea276a4108aa11f9c87717 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.text.SpannableString;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -162,7 +163,6 @@ public class BrowserAccessibilityManager {
         if (!mAccessibilityManager.isEnabled() || mNativeObj == 0) {
             return null;
         }
-
         int rootId = nativeGetRootId(mNativeObj);
 
         if (virtualViewId == View.NO_ID) {
@@ -211,6 +211,8 @@ public class BrowserAccessibilityManager {
      * @see AccessibilityNodeProvider#performAction(int, int, Bundle)
      */
     protected boolean performAction(int virtualViewId, int action, Bundle arguments) {
+        Log.i("BrowserAccessibilityManager",
+                "performAction virtualViewId=" + virtualViewId + ", action=" + action);
         // We don't support any actions on the host view or nodes
         // that are not (any longer) in the tree.
         if (!mAccessibilityManager.isEnabled() || mNativeObj == 0
@@ -221,7 +223,6 @@ public class BrowserAccessibilityManager {
         switch (action) {
             case AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS:
                 if (!moveAccessibilityFocusToId(virtualViewId)) return true;
-
                 if (!mIsHovering) {
                     nativeScrollToMakeNodeVisible(
                             mNativeObj, mAccessibilityFocusId);
@@ -357,6 +358,12 @@ public class BrowserAccessibilityManager {
         return false;
     }
 
+    public void OnAutofillPopupDisplayed() {
+        nativeOnAutofillPopupDisplayed(mNativeObj);
+    }
+    public void OnAutofillPopupDismissed() {
+        nativeOnAutofillPopupDismissed(mNativeObj);
+    }
     /**
      * @see View#onHoverEvent(MotionEvent)
      */
@@ -561,7 +568,6 @@ public class BrowserAccessibilityManager {
                     AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
             mAccessibilityFocusId = View.NO_ID;
         }
-
         moveAccessibilityFocusToId(newAccessibilityFocusId);
     }
 
@@ -707,6 +713,7 @@ public class BrowserAccessibilityManager {
 
     @CalledByNative
     private void handleFocusChanged(int id) {
+        Log.i("BrowserAccessibilityManager", "handleFocusChanged id=" + id);
         if (mNativeObj == 0) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_FOCUSED);
         moveAccessibilityFocusToId(id);
@@ -720,6 +727,7 @@ public class BrowserAccessibilityManager {
 
     @CalledByNative
     private void handleClicked(int id) {
+        Log.i("BrowserAccessibilityManager", "handleClicked id=" + id);
         if (mNativeObj == 0) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_CLICKED);
     }
@@ -1162,6 +1170,10 @@ public class BrowserAccessibilityManager {
                         Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) == 1);
     }
 
+    private native void nativeOnAutofillPopupDisplayed(
+            long nativeBrowserAccessibilityManagerAndroid);
+    private native void nativeOnAutofillPopupDismissed(
+            long nativeBrowserAccessibilityManagerAndroid);
     private native int nativeGetRootId(long nativeBrowserAccessibilityManagerAndroid);
     private native boolean nativeIsNodeValid(long nativeBrowserAccessibilityManagerAndroid, int id);
     private native boolean nativeIsEditableText(