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

Remove nativeCursorMatchesFocus, which is no longer necessary.

Browse Source 
Bug:3335014

Requires a change in external/webkit.

Change-Id: I1dbaa73e86f312c6142c915e8cb252cf238f09c3
This commit is contained in:
Leon Scroggins
2011-01-10 17:52:41 -05:00
committed by Ed Heyl
parent 55ccb88775
commit 86e1fa647f
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/webkit/WebTextView.java
View File

@@ -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)) {

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

@@ -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();