diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-10 17:52:41 -0500 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2011-01-10 17:28:02 -0800 |
| commit | 86e1fa647f7541b091753cf6a2314935b1011406 (patch) | |
| tree | 657ff3ea308155cb5f78ad55d3752a15ee9b26b0 /core/java/android/webkit/WebTextView.java | |
| parent | 55ccb8877549c539daa9b78d370452680045a77b (diff) | |
Remove nativeCursorMatchesFocus, which is no longer necessary.
Bug:3335014
Requires a change in external/webkit.
Change-Id: I1dbaa73e86f312c6142c915e8cb252cf238f09c3
Diffstat (limited to 'core/java/android/webkit/WebTextView.java')
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 16 |
1 files changed, 1 insertions, 15 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)) { |