diff options
| author | John Reck <jreck@google.com> | 2011-10-07 13:10:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 13:10:55 -0700 |
| commit | 25d888b5ff23acf1a9d41bef3e74ee897baf5ad7 (patch) | |
| tree | 013e85fe2d76a813884c4ab9db8a8e5b1d47f475 /core/java/android/webkit/WebView.java | |
| parent | cf6bc99b97d398c13bbf7a2d8656670f197d8220 (diff) | |
| parent | fffce6fe99f7ae80f448790371b8c0fa90277d1a (diff) | |
| download | frameworks_base-25d888b5ff23acf1a9d41bef3e74ee897baf5ad7.zip frameworks_base-25d888b5ff23acf1a9d41bef3e74ee897baf5ad7.tar.gz frameworks_base-25d888b5ff23acf1a9d41bef3e74ee897baf5ad7.tar.bz2 | |
Merge "Fix calc visible to account for action bar"
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index d920f27..05d8da2 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1483,7 +1483,8 @@ public class WebView extends AbsoluteLayout private int getVisibleTitleHeightImpl() { // need to restrict mScrollY due to over scroll - return Math.max(getTitleHeight() - Math.max(0, mScrollY), 0); + return Math.max(getTitleHeight() - Math.max(0, mScrollY), + mFindCallback != null ? mFindCallback.getActionModeHeight() : 0); } /* |