summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2009-11-10 15:34:34 -0800
committer Grace Kloba <klobag@google.com> 2009-11-11 14:43:16 -0800
commitbf5b632abbc2f4b96323ff428be585fd2a3d381c (patch)
treedefc771a9a91c81b8b8c8ae4df003e81fec0b2e9
parentd7439f4bdb31d005011b69112e82a9fed9be4470 (diff)
Use getViewHeightWithTitle() to honor the scrollbar
setting when computing the maxScrollY for fling. This is honored in the regular scroll in computeVerticalScrollExtent(). Fix http://b/issue?id=2251694
-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 142774ff035a..a8d9f1d5275c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4297,7 +4297,7 @@ public class WebView extends AbsoluteLayout
private int computeMaxScrollY() {
int maxContentH = computeVerticalScrollRange() + getTitleHeight();
- return Math.max(maxContentH - getHeight(), getTitleHeight());
+ return Math.max(maxContentH - getViewHeightWithTitle(), getTitleHeight());
}
public void flingScroll(int vx, int vy) {