diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-22 11:17:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-22 11:17:50 -0700 |
| commit | 2867be8820963e03a091fb86ea4569ec9a2a4101 (patch) | |
| tree | 0b53a8a158f9ab35a05e4c49ac5ba129f9c5b96d | |
| parent | bc8a886c621cd4d291b5038d89308cdb3db35b27 (diff) | |
| parent | 64336a40515874066040d058f3bdea338904a5f2 (diff) | |
| download | frameworks_base-2867be8820963e03a091fb86ea4569ec9a2a4101.zip frameworks_base-2867be8820963e03a091fb86ea4569ec9a2a4101.tar.gz frameworks_base-2867be8820963e03a091fb86ea4569ec9a2a4101.tar.bz2 | |
Merge "Add a fixed viewport margin since website content width changes."
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ final class WebViewCore { 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 --> |