diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-14 14:53:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-14 14:53:52 -0700 |
| commit | 51969178b2a82473e5664a60705ef0a2e1d3e10d (patch) | |
| tree | 9c7617059ec1d87067ec35bbd41f0b9e1ff4f618 | |
| parent | ba7aad209f2b130a953467abd8cb41357fc20410 (diff) | |
| parent | c42f8b833241162968c5dbdedc18859908730823 (diff) | |
| download | frameworks_base-51969178b2a82473e5664a60705ef0a2e1d3e10d.zip frameworks_base-51969178b2a82473e5664a60705ef0a2e1d3e10d.tar.gz frameworks_base-51969178b2a82473e5664a60705ef0a2e1d3e10d.tar.bz2 | |
Merge "Remove not-used code."
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 9 | ||||
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 4689740..1dd2e8f 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -179,7 +179,6 @@ public class WebSettings { private boolean mUseDoubleTree = false; private boolean mUseWideViewport = false; private boolean mUseFixedViewport = false; - private int mMaxFixedViewportWidth = WebView.DEFAULT_VIEWPORT_WIDTH; private boolean mSupportMultipleWindows = false; private boolean mShrinksStandaloneImagesToFit = false; private long mMaximumDecodedImageSize = 0; // 0 means default @@ -378,7 +377,6 @@ public class WebSettings { final int minTabletWidth = context.getResources().getDimensionPixelSize( com.android.internal.R.dimen.min_xlarge_screen_width); mUseFixedViewport = (metrics.density == 1.0f && landscapeWidth >= minTabletWidth); - mMaxFixedViewportWidth = (int) (landscapeWidth * 1.25); if (sLockForLocaleSettings == null) { sLockForLocaleSettings = new Object(); @@ -1570,13 +1568,6 @@ public class WebSettings { } /** - * Returns maximum fixed viewport width. - */ - /* package */ int getMaxFixedViewportWidth() { - return mMaxFixedViewportWidth; - } - - /** * Returns whether private browsing is enabled. */ /* package */ boolean isPrivateBrowsingEnabled() { diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index b46cec7..b0a96be 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -844,7 +844,7 @@ class ZoomManager { if (mInitialScale > 0) { scale = mInitialScale; reflowText = exceedsMinScaleIncrement(mTextWrapScale, scale); - } else if (viewState.mViewScale > 0 && + } else if (viewState.mViewScale > 0 && (viewState.mMobileSite || !settings.getUseFixedViewport())) { mTextWrapScale = viewState.mTextWrapScale; scale = viewState.mViewScale; diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 6ec8017..0928ce0 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -46,8 +46,6 @@ <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 --> |