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

am dfc07279: Line up WebTextView text with the page.

Browse Source 
Merge commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4' into gingerbread-plus-aosp

* commit 'dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4':
  Line up WebTextView text with the page.
This commit is contained in:
Leon Scroggins
2010-10-13 07:56:38 -07:00
committed by Android Git Automerger
parent 1442818a10 dfc07279fc
commit c7ee44cbe1
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3955,6 +3955,16 @@ public class WebView extends AbsoluteLayout
// requestFormData, and it needs to have the correct nodePointer. // requestFormData, and it needs to have the correct nodePointer.
mWebTextView.setNodePointer(nodePointer); mWebTextView.setNodePointer(nodePointer);
mWebTextView.setType(nativeFocusCandidateType()); mWebTextView.setType(nativeFocusCandidateType());
Rect paddingRect = nativeFocusCandidatePaddingRect();
if (paddingRect != null) {
// Use contentToViewDimension since these are the dimensions of
// the padding.
mWebTextView.setPadding(
contentToViewDimension(paddingRect.left),
contentToViewDimension(paddingRect.top),
contentToViewDimension(paddingRect.right),
contentToViewDimension(paddingRect.bottom));
}
if (null == text) { if (null == text) {
if (DebugFlags.WEB_VIEW) { if (DebugFlags.WEB_VIEW) {
Log.v(LOGTAG, "rebuildWebTextView null == text"); Log.v(LOGTAG, "rebuildWebTextView null == text");
@@ -7861,6 +7871,13 @@ public class WebView extends AbsoluteLayout
/* package */ native int nativeFocusCandidateMaxLength(); /* package */ native int nativeFocusCandidateMaxLength();
/* package */ native String nativeFocusCandidateName(); /* package */ native String nativeFocusCandidateName();
private native Rect nativeFocusCandidateNodeBounds(); private native Rect nativeFocusCandidateNodeBounds();
/**
* @return A Rect with left, top, right, bottom set to the corresponding
* padding values in the focus candidate, if it is a textfield/textarea with
* a style. Otherwise return null. This is not actually a rectangle; Rect
* is being used to pass four integers.
*/
private native Rect nativeFocusCandidatePaddingRect();
/* package */ native int nativeFocusCandidatePointer(); /* package */ native int nativeFocusCandidatePointer();
private native String nativeFocusCandidateText(); private native String nativeFocusCandidateText();
private native int nativeFocusCandidateTextSize(); private native int nativeFocusCandidateTextSize();