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

When clicking on a WebTextView, always call nativeMotionUp.

Browse Source 
We were previously calling nativeTextInputMotionUp, which was
intended to be faster than nativeMotionUp, which does more work.
However, as discussed in http://b/issue?id=2257787 , I think we
should simply call nativeMotionUp, which does everything the old
method did, while also correcting things if necessary.  This fixes
the second problem listed in http://b/issue?id=2266756 , since
nativeMotionUp will recognize that the <select> element should
take the click.

Since I have removed a native method, this requires a change to
external/webkit.
This commit is contained in:
Leon Scroggins
2009-11-24 14:49:21 -05:00
parent a2d259aa4a
commit f90b1261a5
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4787,7 +4787,7 @@ public class WebView extends AbsoluteLayout
} }
/** /**
* Do a touch up from a WebTextView. This will be handled by webkit to * Due a touch up from a WebTextView. This will be handled by webkit to
* change the selection. * change the selection.
* @param event MotionEvent in the WebTextView's coordinates. * @param event MotionEvent in the WebTextView's coordinates.
*/ */
@@ -4797,10 +4797,7 @@ public class WebView extends AbsoluteLayout
} }
int x = viewToContentX((int) event.getX() + mWebTextView.getLeft()); int x = viewToContentX((int) event.getX() + mWebTextView.getLeft());
int y = viewToContentY((int) event.getY() + mWebTextView.getTop()); int y = viewToContentY((int) event.getY() + mWebTextView.getTop());
if (nativeFocusNodePointer() != nativeCursorNodePointer()) { nativeMotionUp(x, y, mNavSlop);
nativeMotionUp(x, y, mNavSlop);
}
nativeTextInputMotionUp(x, y);
} }
/** /**
@@ -5941,12 +5938,6 @@ public class WebView extends AbsoluteLayout
private native void nativeSetHeightCanMeasure(boolean measure); private native void nativeSetHeightCanMeasure(boolean measure);
// Returns a value corresponding to CachedFrame::ImeAction // Returns a value corresponding to CachedFrame::ImeAction
/* package */ native int nativeTextFieldAction(); /* package */ native int nativeTextFieldAction();
/**
* Perform a click on a currently focused text input. Since it is already
* focused, there is no need to go through the nativeMotionUp code, which
* may change the Cursor.
*/
private native void nativeTextInputMotionUp(int x, int y);
private native int nativeTextGeneration(); private native int nativeTextGeneration();
// Never call this version except by updateCachedTextfield(String) - // Never call this version except by updateCachedTextfield(String) -
// we always want to pass in our generation number. // we always want to pass in our generation number.