Merge "Add a fixed viewport margin since website content width changes."
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index af7d95e..bb43690 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1829,9 +1829,11 @@
draw.mViewState = mInitialViewState;
if (mViewportWidth == -1 && mSettings.getUseFixedViewport() &&
mSettings.getUseWideViewPort()) {
+ final int fixedViewportMargin = mContext.getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.fixed_viewport_margin);
// Use website's initial preferred width as the fixed viewport width.
mViewportWidth = Math.min(mSettings.getMaxFixedViewportWidth(),
- Math.max(draw.mWidthHeight.x, draw.mMinPrefWidth));
+ draw.mMinPrefWidth + 2 * fixedViewportMargin);
draw.mViewState.mViewportWidth = mViewportWidth;
}
mInitialViewState = null;
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 539a986..171bb45 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -45,6 +45,8 @@
<dimen name="fastscroll_thumb_height">52dp</dimen>
<!-- Min width for a tablet device -->
<dimen name="min_xlarge_screen_width">800dp</dimen>
+ <!-- Fixed viewport margin for website content width change -->
+ <dimen name="fixed_viewport_margin">7dp</dimen>
<!-- Default height of a key in the password keyboard for alpha -->
<dimen name="password_keyboard_key_height_alpha">56dip</dimen>
<!-- Default height of a key in the password keyboard for numeric -->