diff options
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 16 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 1 |
2 files changed, 1 insertions, 16 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 4c2f0b459806..1313fccb8bde 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -204,11 +204,6 @@ import junit.framework.Assert; case KeyEvent.KEYCODE_DPAD_RIGHT: case KeyEvent.KEYCODE_DPAD_UP: case KeyEvent.KEYCODE_DPAD_DOWN: - if (!mWebView.nativeCursorMatchesFocus()) { - return down ? mWebView.onKeyDown(keyCode, event) : mWebView - .onKeyUp(keyCode, event); - - } isArrowKey = true; break; } @@ -258,10 +253,6 @@ import junit.framework.Assert; if (isPopupShowing()) { return super.dispatchKeyEvent(event); } - if (!mWebView.nativeCursorMatchesFocus()) { - return down ? mWebView.onKeyDown(keyCode, event) : mWebView - .onKeyUp(keyCode, event); - } // Center key should be passed to a potential onClick if (!down) { mWebView.centerKeyPressOnTextField(); @@ -753,12 +744,7 @@ import junit.framework.Assert; if (event.getAction() != MotionEvent.ACTION_MOVE) { return false; } - // If the Cursor is not on the text input, webview should handle the - // trackball - if (!mWebView.nativeCursorMatchesFocus()) { - return mWebView.onTrackballEvent(event); - } - Spannable text = (Spannable) getText(); + Spannable text = getText(); MovementMethod move = getMovementMethod(); if (move != null && getLayout() != null && move.onTrackballEvent(this, text, event)) { diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 3754ee201c9a..e8283a6b8b98 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -8098,7 +8098,6 @@ public class WebView extends AbsoluteLayout private native int nativeCursorFramePointer(); private native Rect nativeCursorNodeBounds(); private native int nativeCursorNodePointer(); - /* package */ native boolean nativeCursorMatchesFocus(); private native boolean nativeCursorIntersects(Rect visibleRect); private native boolean nativeCursorIsAnchor(); private native boolean nativeCursorIsTextInput(); |