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

am f90b1261: When clicking on a WebTextView, always call nativeMotionUp.

Browse Source 
Merge commit 'f90b1261a53bc0bfc772337551eb4c540022cd22' into eclair-mr2-plus-aosp

* commit 'f90b1261a53bc0bfc772337551eb4c540022cd22':
  When clicking on a WebTextView, always call nativeMotionUp.
This commit is contained in:
Leon Scroggins
2009-11-25 07:48:09 -08:00
committed by Android Git Automerger
parent 08878156e6 f90b1261a5
commit 0e1fcb1694
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.
* @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 y = viewToContentY((int) event.getY() + mWebTextView.getTop());
if (nativeFocusNodePointer() != nativeCursorNodePointer()) {
nativeMotionUp(x, y, mNavSlop);
}
nativeTextInputMotionUp(x, y);
nativeMotionUp(x, y, mNavSlop);
}
/**
@@ -5941,12 +5938,6 @@ public class WebView extends AbsoluteLayout
private native void nativeSetHeightCanMeasure(boolean measure);
// Returns a value corresponding to CachedFrame::ImeAction
/* 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();
// Never call this version except by updateCachedTextfield(String) -
// we always want to pass in our generation number.