Update BrowserAccessibilityManager to support Lollipop SDK.

content/browser/accessibility/browser_accessibility_manager_android.cc

 // 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.
 
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 
 #include <cmath>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 235 matching lines @@
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoParent(
         env, obj, info, node->GetParent()->GetId());
   }
   for (unsigned i = 0; i < node->PlatformChildCount(); ++i) {
     Java_BrowserAccessibilityManager_addAccessibilityNodeInfoChild(
         env, obj, info, node->InternalGetChild(i)->GetId());
   }
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoBooleanAttributes(
       env, obj, info,
       id,
-      node->CanScrollForward(),
-      node->CanScrollBackward(),
       node->IsCheckable(),
       node->IsChecked(),
       node->IsClickable(),
-      node->IsEditableText(),
       node->IsEnabled(),
       node->IsFocusable(),
       node->IsFocused(),
       node->IsPassword(),
       node->IsScrollable(),
       node->IsSelected(),
       node->IsVisibleToUser());
+  Java_BrowserAccessibilityManager_addAccessibilityNodeInfoActions(
+      env, obj, info,
+      id,
+      node->CanScrollForward(),
+      node->CanScrollBackward(),
+      node->IsClickable(),
+      node->IsEditableText(),
+      node->IsEnabled(),
+      node->IsFocusable(),
+      node->IsFocused());
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoClassName(
       env, obj, info,
       base::android::ConvertUTF8ToJavaString(env, node->GetClassName()).obj());
   if (!node->IsPassword() ||
       Java_BrowserAccessibilityManager_shouldExposePasswordText(env, obj)) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoContentDescription(
         env, obj, info,
         base::android::ConvertUTF16ToJavaString(env, node->GetText()).obj(),
         node->IsLink());
   }
 
   gfx::Rect absolute_rect = node->GetLocalBoundsRect();
   gfx::Rect parent_relative_rect = absolute_rect;
   if (node->GetParent()) {
     gfx::Rect parent_rect = node->GetParent()->GetLocalBoundsRect();
     parent_relative_rect.Offset(-parent_rect.OffsetFromOrigin());
   }
   bool is_root = node->GetParent() == NULL;
   Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLocation(
       env, obj, info,
       id,
       absolute_rect.x(), absolute_rect.y(),
       parent_relative_rect.x(), parent_relative_rect.y(),
       absolute_rect.width(), absolute_rect.height(),
       is_root);
 
-  // New KitKat APIs
-  Java_BrowserAccessibilityManager_setAccessibilityNodeInfoKitKatAttributes(
+  Java_BrowserAccessibilityManager_setAccessibilityNodeInfoLollipopAttributes(
       env, obj, info,
       node->CanOpenPopup(),
       node->IsContentInvalid(),
       node->IsDismissable(),
       node->IsMultiLine(),
       node->AndroidInputType(),
       node->AndroidLiveRegionType());
   if (node->IsCollection()) {
     Java_BrowserAccessibilityManager_setAccessibilityNodeInfoCollectionInfo(
         env, obj, info,
@@ skipping 78 matching lines @@
           node->GetSelectionStart(),
           node->GetSelectionEnd(),
           node->GetEditableTextLength(),
           base::android::ConvertUTF16ToJavaString(env, text).obj());
       break;
     }
     default:
       break;
   }
 
-  // Backwards-compatible fallback for new KitKat APIs.
-  Java_BrowserAccessibilityManager_setAccessibilityEventKitKatAttributes(
+  Java_BrowserAccessibilityManager_setAccessibilityEventLollipopAttributes(
       env, obj, event,
       node->CanOpenPopup(),
       node->IsContentInvalid(),
       node->IsDismissable(),
       node->IsMultiLine(),
       node->AndroidInputType(),
       node->AndroidLiveRegionType());
   if (node->IsCollection()) {
     Java_BrowserAccessibilityManager_setAccessibilityEventCollectionInfo(
         env, obj, event,
@@ skipping 333 matching lines @@
 BrowserAccessibilityManagerAndroid::UseRootScrollOffsetsWhenComputingBounds() {
   // The Java layer handles the root scroll offset.
   return false;
 }
 
 bool RegisterBrowserAccessibilityManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content