Support KitKat accessibility APIs.

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

 // Copyright 2013 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.content.browser.accessibility;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Build;
@@ skipping 44 matching lines @@
     /**
      * Create a BrowserAccessibilityManager object, which is owned by the C++
      * BrowserAccessibilityManagerAndroid instance, and connects to the content view.
      * @param nativeBrowserAccessibilityManagerAndroid A pointer to the counterpart native
      *     C++ object that owns this object.
      * @param contentViewCore The content view that this object provides accessibility for.
      */
     @CalledByNative
     private static BrowserAccessibilityManager create(int nativeBrowserAccessibilityManagerAndroid,
             ContentViewCore contentViewCore) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            return new KitKatBrowserAccessibilityManager(
+                    nativeBrowserAccessibilityManagerAndroid, contentViewCore);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             return new JellyBeanBrowserAccessibilityManager(
                     nativeBrowserAccessibilityManagerAndroid, contentViewCore);
         } else {
             return new BrowserAccessibilityManager(
                     nativeBrowserAccessibilityManagerAndroid, contentViewCore);
         }
     }
 
     protected BrowserAccessibilityManager(int nativeBrowserAccessibilityManagerAndroid,
             ContentViewCore contentViewCore) {
@@ skipping 158 matching lines @@
 
         // This is currently needed if we want Android to draw the yellow box around
         // the item that has accessibility focus. In practice, this doesn't seem to slow
         // things down, because it's only called when the accessibility focus moves.
         // TODO(dmazzoni): remove this if/when Android framework fixes bug.
         mContentViewCore.getContainerView().postInvalidate();
 
         mContentViewCore.getContainerView().requestSendAccessibilityEvent(mView, event);
     }
 
+    private Bundle getOrCreateBundleForAccessibilityEvent(AccessibilityEvent event) {
+        Bundle bundle = (Bundle)event.getParcelableData();
+        if (bundle == null) {
+            bundle = new Bundle();
+            event.setParcelableData(bundle);
+        }
+        return bundle;
+    }
+
     @CalledByNative
     private void handlePageLoaded(int id) {
         if (mUserHasTouchExplored) return;
 
         if (mFocusPageOnLoad) {
             // Focus the natively focused node (usually document),
             // if this feature is enabled.
             mAccessibilityFocusId = id;
             sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_FOCUSED);
         }
@@ skipping 135 matching lines @@
 
         // Finally offset by the location of the view within the screen.
         final int[] viewLocation = new int[2];
         mView.getLocationOnScreen(viewLocation);
         rect.offset(viewLocation[0], viewLocation[1]);
 
         node.setBoundsInScreen(rect);
     }
 
     @CalledByNative
+    protected void setAccessibilityNodeInfoKitKatAttributes(AccessibilityNodeInfo node,
+            boolean canOpenPopup,
+            boolean contentInvalid,
+            boolean dismissable,
+            boolean multiLine,
+            int inputType,
+            int liveRegion) {
+        // Requires KitKat or higher.
+    }
+
+    @CalledByNative
+    protected void setAccessibilityNodeInfoCollectionInfo(AccessibilityNodeInfo node,
+            int rowCount, int columnCount, boolean hierarchical) {
+        // Requires KitKat or higher.
+    }
+
+    @CalledByNative
+    protected void setAccessibilityNodeInfoCollectionItemInfo(AccessibilityNodeInfo node,
+            int rowIndex, int rowSpan, int columnIndex, int columnSpan, boolean heading) {
+        // Requires KitKat or higher.
+    }
+
+    @CalledByNative
+    protected void setAccessibilityNodeInfoRangeInfo(AccessibilityNodeInfo node,
+            int rangeType, float min, float max, float current) {
+        // Requires KitKat or higher.
+    }
+
+    @CalledByNative
     private void setAccessibilityEventBooleanAttributes(AccessibilityEvent event,
             boolean checked, boolean enabled, boolean password, boolean scrollable) {
         event.setChecked(checked);
         event.setEnabled(enabled);
         event.setPassword(password);
         event.setScrollable(scrollable);
     }
 
     @CalledByNative
     private void setAccessibilityEventClassName(AccessibilityEvent event, String className) {
@@ skipping 28 matching lines @@
 
     @CalledByNative
     private void setAccessibilityEventSelectionAttrs(AccessibilityEvent event,
             int fromIndex, int addedCount, int itemCount, String text) {
         event.setFromIndex(fromIndex);
         event.setAddedCount(addedCount);
         event.setItemCount(itemCount);
         event.getText().add(text);
     }
 
+    @CalledByNative
+    protected void setAccessibilityEventKitKatAttributes(AccessibilityEvent event,
+            boolean canOpenPopup,
+            boolean contentInvalid,
+            boolean dismissable,
+            boolean multiLine,
+            int inputType,
+            int liveRegion) {
+        Bundle bundle = getOrCreateBundleForAccessibilityEvent(event);
+        bundle.putBoolean("canOpenPopup", canOpenPopup);

[Peter Lundblad, 2013/11/19 18:40:53]

Since we are not doing any namespacing here, do we need a way to make it
possible for an accessibility service to detect that this bundle is from Chrome.
I am thinking about the web view case where the packag ename of the event is not
going to be chrome.

+        bundle.putBoolean("contentInvalid", contentInvalid);
+        bundle.putBoolean("dismissable", dismissable);
+        bundle.putBoolean("multiLine", multiLine);
+        bundle.putInt("inputType", inputType);
+        bundle.putInt("liveRegion", liveRegion);
+    }
+
+    @CalledByNative
+    protected void setAccessibilityEventCollectionInfo(AccessibilityEvent event,
+            int rowCount, int columnCount, boolean hierarchical) {
+        Bundle bundle = getOrCreateBundleForAccessibilityEvent(event);
+        bundle.putInt("CollectionInfo.rowCount", rowCount);
+        bundle.putInt("CollectionInfo.columnCount", columnCount);
+        bundle.putBoolean("CollectionInfo.hierarchical", hierarchical);
+    }
+
+    @CalledByNative
+    protected void setAccessibilityEventCollectionItemInfo(AccessibilityEvent event,
+            int rowIndex, int rowSpan, int columnIndex, int columnSpan, boolean heading) {
+        Bundle bundle = getOrCreateBundleForAccessibilityEvent(event);
+        bundle.putInt("CollectionItemInfo.rowIndex", rowIndex);
+        bundle.putInt("CollectionItemInfo.rowSpan", rowSpan);
+        bundle.putInt("CollectionItemInfo.columnIndex", columnIndex);
+        bundle.putInt("CollectionItemInfo.columnSpan", columnSpan);
+        bundle.putBoolean("CollectionItemInfo.heading", heading);
+    }
+
+    @CalledByNative
+    protected void setAccessibilityEventRangeInfo(AccessibilityEvent event,
+            int rangeType, float min, float max, float current) {
+        Bundle bundle = getOrCreateBundleForAccessibilityEvent(event);
+        bundle.putInt("RangeInfo.type", rangeType);
+        bundle.putFloat("RangeInfo.min", min);
+        bundle.putFloat("RangeInfo.max", max);
+        bundle.putFloat("RangeInfo.current", current);
+    }
+
     private native int nativeGetRootId(int nativeBrowserAccessibilityManagerAndroid);
     private native int nativeHitTest(int nativeBrowserAccessibilityManagerAndroid, int x, int y);
     private native boolean nativePopulateAccessibilityNodeInfo(
         int nativeBrowserAccessibilityManagerAndroid, AccessibilityNodeInfo info, int id);
     private native boolean nativePopulateAccessibilityEvent(
         int nativeBrowserAccessibilityManagerAndroid, AccessibilityEvent event, int id,
         int eventType);
     private native void nativeClick(int nativeBrowserAccessibilityManagerAndroid, int id);
     private native void nativeFocus(int nativeBrowserAccessibilityManagerAndroid, int id);
     private native void nativeBlur(int nativeBrowserAccessibilityManagerAndroid);
 }