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

Merge "DO NOT MERGE Consider current scroll position to move text field into view." into jb-dev

Browse Source
This commit is contained in:
George Mount
2012-05-22 11:42:41 -07:00
committed by Android (Google) Code Review
parent 76cf78165f 12221d1540
commit 37f29abe1d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5504,8 +5504,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
if (visibleRect.contains(mEditTextContentBounds)) {
return; // no need to scroll
}
nativeFindMaxVisibleRect(mNativeClass, mEditTextLayerId, visibleRect);
syncSelectionCursors();
nativeFindMaxVisibleRect(mNativeClass, mEditTextLayerId, visibleRect);
final int buffer = Math.max(1, viewToContentDimension(EDIT_RECT_BUFFER));
Rect showRect = new Rect(
Math.max(0, mEditTextContentBounds.left - buffer),
@@ -5538,17 +5538,19 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
return; // no need to scroll
}
int scrollX = visibleRect.left;
int scrollX = viewToContentX(getScrollX());
if (visibleRect.left > showRect.left) {
scrollX = showRect.left;
// We are scrolled too far
scrollX += showRect.left - visibleRect.left;
} else if (visibleRect.right < showRect.right) {
scrollX = Math.max(0, showRect.right - visibleRect.width());
// We aren't scrolled enough to include the right
scrollX += showRect.right - visibleRect.right;
}
int scrollY = visibleRect.top;
int scrollY = viewToContentY(getScrollY());
if (visibleRect.top > showRect.top) {
scrollY = showRect.top;
scrollY += showRect.top - visibleRect.top;
} else if (visibleRect.bottom < showRect.bottom) {
scrollY = Math.max(0, showRect.bottom - visibleRect.height());
scrollY += showRect.bottom - visibleRect.bottom;
}
contentScrollTo(scrollX, scrollY, false);