summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-10-26 10:05:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-26 10:05:20 -0700
commit48c9daac20dcae18bf45e528fd073612bc0122e1 (patch)
treee2840ddf30464d088fc8a972ad04735fa9c787f3 /core/java
parent028b537051d56e0b02acd599b42cfd13871f31c2 (diff)
parent346f97f82f5515a283f0fadaa819f7442472d962 (diff)
downloadframeworks_base-48c9daac20dcae18bf45e528fd073612bc0122e1.zip
frameworks_base-48c9daac20dcae18bf45e528fd073612bc0122e1.tar.gz
frameworks_base-48c9daac20dcae18bf45e528fd073612bc0122e1.tar.bz2
Merge "Fix the viewport height to view height when title bar is visible."
Diffstat (limited to 'core/java')
-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 c095199..908a6ab 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2471,7 +2471,7 @@ public class WebView extends AbsoluteLayout
int viewWidth = getViewWidth();
int newWidth = Math.round(viewWidth * mZoomManager.getInvScale());
- int newHeight = Math.round(getViewHeight() * mZoomManager.getInvScale());
+ int newHeight = Math.round((getViewHeightWithTitle() - getTitleHeight()) * mZoomManager.getInvScale());
/*
* Because the native side may have already done a layout before the
* View system was able to measure us, we have to send a height of 0 to