Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev

Browse Source 
* commit '4cb3b76caa004867bac43f0001072e24bfa8c120':
  Ensure WebViewClassic calls super.onHoverEvent()
This commit is contained in:
Svetoslav Ganov
2012-06-18 10:36:12 -07:00
committed by Android Git Automerger
parent 32cd40e604 4cb3b76caa
commit 05fa21fa77
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebView.java
View File

@@ -1686,6 +1686,10 @@ public class WebView extends AbsoluteLayout
WebView.super.computeScroll(); WebView.super.computeScroll();
} }
public boolean super_onHoverEvent(MotionEvent event) {
return WebView.super.onHoverEvent(event);
}
public boolean super_performAccessibilityAction(int action, Bundle arguments) { public boolean super_performAccessibilityAction(int action, Bundle arguments) {
return WebView.super.performAccessibilityAction(action, arguments); return WebView.super.performAccessibilityAction(action, arguments);
} }

1
core/java/android/webkit/WebViewClassic.java
View File

@@ -5711,6 +5711,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
int x = viewToContentX((int) event.getX() + getScrollX()); int x = viewToContentX((int) event.getX() + getScrollX());
int y = viewToContentY((int) event.getY() + getScrollY()); int y = viewToContentY((int) event.getY() + getScrollY());
mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, x, y); mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, x, y);
mWebViewPrivate.super_onHoverEvent(event);
return true; return true;
} }