Merge "Fix accessibility delegation"

2 files changed, 16 insertions, 13 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 1723e96..81f8c4e 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2070,8 +2070,8 @@ public class WebView extends AbsoluteLayout
             return WebView.super.onHoverEvent(event);
         }
 
-        public boolean super_performAccessibilityAction(int action, Bundle arguments) {
-            return WebView.super.performAccessibilityAction(action, arguments);
+        public boolean super_performAccessibilityActionInternal(int action, Bundle arguments) {
+            return WebView.super.performAccessibilityActionInternal(action, arguments);
         }
 
         public boolean super_performLongClick() {
@@ -2379,23 +2379,26 @@ public class WebView extends AbsoluteLayout
         return mProvider.getViewDelegate().shouldDelayChildPressedState();
     }
 
+    /** @hide */
     @Override
-    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
-        super.onInitializeAccessibilityNodeInfo(info);
+    public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
+        super.onInitializeAccessibilityNodeInfoInternal(info);
         info.setClassName(WebView.class.getName());
-        mProvider.getViewDelegate().onInitializeAccessibilityNodeInfo(info);
+        mProvider.getViewDelegate().onInitializeAccessibilityNodeInfoInternal(info);
     }
 
+    /** @hide */
     @Override
-    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
-        super.onInitializeAccessibilityEvent(event);
+    public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
+        super.onInitializeAccessibilityEventInternal(event);
         event.setClassName(WebView.class.getName());
-        mProvider.getViewDelegate().onInitializeAccessibilityEvent(event);
+        mProvider.getViewDelegate().onInitializeAccessibilityEventInternal(event);
     }
 
+    /** @hide */
     @Override
-    public boolean performAccessibilityAction(int action, Bundle arguments) {
-        return mProvider.getViewDelegate().performAccessibilityAction(action, arguments);
+    public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
+        return mProvider.getViewDelegate().performAccessibilityActionInternal(action, arguments);
     }
 
     /** @hide */
diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java
index 2aee57b..e8be4a6 100644
--- a/core/java/android/webkit/WebViewProvider.java
+++ b/core/java/android/webkit/WebViewProvider.java
@@ -292,11 +292,11 @@ public interface WebViewProvider {
 
         public AccessibilityNodeProvider getAccessibilityNodeProvider();
 
-        public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info);
+        public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info);
 
-        public void onInitializeAccessibilityEvent(AccessibilityEvent event);
+        public void onInitializeAccessibilityEventInternal(AccessibilityEvent event);
 
-        public boolean performAccessibilityAction(int action, Bundle arguments);
+        public boolean performAccessibilityActionInternal(int action, Bundle arguments);
 
         public void setOverScrollMode(int mode);