summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-11-11 17:14:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-11 17:14:10 -0800
commit9f4baf308daebbad0d3a634b158f3eb4ae532d39 (patch)
tree811c0e46cfc6df614eb522c07a61c38ad90cc399
parent09550fde489a6d5155f005fec9b328f1b2a878a6 (diff)
parentd7439f4bdb31d005011b69112e82a9fed9be4470 (diff)
downloadframeworks_base-9f4baf308daebbad0d3a634b158f3eb4ae532d39.zip
frameworks_base-9f4baf308daebbad0d3a634b158f3eb4ae532d39.tar.gz
frameworks_base-9f4baf308daebbad0d3a634b158f3eb4ae532d39.tar.bz2
am d7439f4b: Use computeVerticalScrollRange() to find the bottom of the page as mContentHeight is not in the view system.
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-mr2 * commit 'd7439f4bdb31d005011b69112e82a9fed9be4470': Use computeVerticalScrollRange() to find the bottom
-rw-r--r--core/java/android/webkit/WebView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5fd6a6c..3d42178 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1537,7 +1537,7 @@ public class WebView extends AbsoluteLayout
}
nativeClearCursor(); // start next trackball movement from page edge
if (bottom) {
- return pinScrollTo(mScrollX, mContentHeight, true, 0);
+ return pinScrollTo(mScrollX, computeVerticalScrollRange(), true, 0);
}
// Page down.
int h = getHeight();