diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2011-11-03 13:21:18 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2011-11-03 13:21:18 -0700 |
| commit | e59e301ca0e28d88439c626b7d177e7eeac06456 (patch) | |
| tree | a6e16eddc29611de664df02d1e68120216edb1f8 /core/java/android/webkit/ZoomManager.java | |
| parent | b419abcadad79cd908acfe51dc6e8902c16ff728 (diff) | |
Update fix to restore view and text wrap scales.
Fixes bug 5544556: All email content is wrapped prematurely.
Previous change (I5a22dd20) didn't take a few other cases of
mViewScale>0 into account.
Change-Id: I4f9578f3558f026c472492ac07d19004416dc228
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index e829571d531f..f599dbae057c 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -1114,7 +1114,7 @@ class ZoomManager { float scale; if (mInitialScale > 0) { scale = mInitialScale; - } else if (viewState.mIsRestored) { + } else if (viewState.mIsRestored || viewState.mViewScale > 0) { scale = (viewState.mViewScale > 0) ? viewState.mViewScale : overviewScale; mTextWrapScale = (viewState.mTextWrapScale > 0) |