diff options
| author | Grace Kloba <klobag@google.com> | 2009-11-11 17:14:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:14:32 -0800 |
| commit | 6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09 (patch) | |
| tree | 35851ca58d274e0b5d09f901c08728c133dbcb85 /core/java | |
| parent | 9f4baf308daebbad0d3a634b158f3eb4ae532d39 (diff) | |
| parent | bf5b632abbc2f4b96323ff428be585fd2a3d381c (diff) | |
| download | frameworks_base-6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09.zip frameworks_base-6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09.tar.gz frameworks_base-6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09.tar.bz2 | |
am bf5b632a: Use getViewHeightWithTitle() to honor the scrollbar setting when computing the maxScrollY for fling. This is honored in the regular scroll in computeVerticalScrollExtent().
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-mr2
* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
Use getViewHeightWithTitle() to honor the scrollbar
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 3d42178..9d5cedd 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4445,7 +4445,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) { |