diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-21 14:40:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-21 14:40:56 -0700 |
| commit | c5152cad1dc0d37704ff7b4f7662c430aa1a765b (patch) | |
| tree | 3a880b1dec3ad6c88cd589ef6e7914ba82829c2a | |
| parent | 82a8a2aa0acc8af59f264d41090c3b99d695c2d5 (diff) | |
| parent | 8db525a9ad64699a7553647abb8bc9efa2418abd (diff) | |
| download | frameworks_base-c5152cad1dc0d37704ff7b4f7662c430aa1a765b.zip frameworks_base-c5152cad1dc0d37704ff7b4f7662c430aa1a765b.tar.gz frameworks_base-c5152cad1dc0d37704ff7b4f7662c430aa1a765b.tar.bz2 | |
Merge "Let restored scale be in effect."
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index b0a96be..0a91ac4 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -844,8 +844,7 @@ class ZoomManager { if (mInitialScale > 0) { scale = mInitialScale; reflowText = exceedsMinScaleIncrement(mTextWrapScale, scale); - } else if (viewState.mViewScale > 0 && - (viewState.mMobileSite || !settings.getUseFixedViewport())) { + } else if (viewState.mViewScale > 0) { mTextWrapScale = viewState.mTextWrapScale; scale = viewState.mViewScale; reflowText = false; |