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

am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread

Browse Source 
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
This commit is contained in:
Leon Scroggins
2010-10-15 18:23:58 -07:00
committed by Android Git Automerger
parent cf054d1cf6 36cb18cf06
commit 46ca6a2289
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,6 +288,21 @@ import java.util.ArrayList;
return ptr == mNodePointer;
}
/**
* Ensure that the underlying textfield is lined up with the WebTextView.
*/
private void lineUpScroll() {
if (mWebView != null) {
float maxScrollX = Touch.getMaxScrollX(this, getLayout(), mScrollY);
if (DebugFlags.WEB_TEXT_VIEW) {
Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y="
+ mScrollY + " maxX=" + maxScrollX);
}
mWebView.scrollFocusedTextInput(maxScrollX > 0 ?
mScrollX / maxScrollX : 0, mScrollY);
}
}
@Override public InputConnection onCreateInputConnection(
EditorInfo outAttrs) {
InputConnection connection = super.onCreateInputConnection(outAttrs);
@@ -358,6 +373,12 @@ import java.util.ArrayList;
mFromFocusChange = false;
}
@Override
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
lineUpScroll();
}
@Override
protected void onSelectionChanged(int selStart, int selEnd) {
if (mInSetTextAndKeepSelection) return;
@@ -378,6 +399,7 @@ import java.util.ArrayList;
+ " selEnd=" + selEnd);
}
mWebView.setSelection(selStart, selEnd);
lineUpScroll();
}
}
@@ -481,16 +503,7 @@ import java.util.ArrayList;
// to big for the case of a small textfield.
int smallerSlop = slop/2;
if (dx > smallerSlop || dy > smallerSlop) {
if (mWebView != null) {
float maxScrollX = (float) Touch.getMaxScrollX(this,
getLayout(), mScrollY);
if (DebugFlags.WEB_TEXT_VIEW) {
Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y="
+ mScrollY + " maxX=" + maxScrollX);
}
mWebView.scrollFocusedTextInput(maxScrollX > 0 ?
mScrollX / maxScrollX : 0, mScrollY);
}
// Scrolling is handled in onScrollChanged.
mScrolled = true;
cancelLongPress();
return true;