Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java |
index a562efa71f1392e47994a51c4360844e05c7b80d..e307a963139444b0869fef9ab139972ecd6445e2 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java |
@@ -17,6 +17,7 @@ import android.view.MotionEvent; |
import android.view.View; |
import android.view.accessibility.AccessibilityEvent; |
import android.view.accessibility.AccessibilityNodeInfo; |
+import android.view.accessibility.AccessibilityNodeProvider; |
import android.view.inputmethod.EditorInfo; |
import android.view.inputmethod.InputConnection; |
import android.widget.FrameLayout; |
@@ -494,6 +495,14 @@ public class ContentView extends FrameLayout |
return mContentViewCore.onGenericMotionEvent(event); |
} |
+ @Override |
+ public boolean dispatchHoverEvent(MotionEvent event) { |
+ if (mContentViewCore.dispatchHoverEvent(event)) { |
+ return true; |
+ } |
+ return super.dispatchHoverEvent(event); |
+ } |
+ |
/** |
* Sets the current amount to offset incoming touch events by. This is used to handle content |
* moving and not lining up properly with the android input system. |
@@ -585,6 +594,15 @@ public class ContentView extends FrameLayout |
} |
@Override |
+ public AccessibilityNodeProvider getAccessibilityNodeProvider() { |
+ AccessibilityNodeProvider provider = mContentViewCore.getAccessibilityNodeProvider(); |
+ if (provider != null) |
+ return provider; |
David Trainor- moved to gerrit
2013/06/20 16:57:11
need {} around these for java style.
dmazzoni
2013/06/21 05:38:55
Done.
|
+ else |
+ return super.getAccessibilityNodeProvider(); |
+ } |
+ |
+ @Override |
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { |
super.onInitializeAccessibilityNodeInfo(info); |
mContentViewCore.onInitializeAccessibilityNodeInfo(info); |