diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-08-16 10:30:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-16 10:30:28 -0700 |
| commit | fbb1bb8ab7c0eda2dc6b53f06c86353151948b4b (patch) | |
| tree | 4339b6e3e5902fa5ba88fb3838a90fff7aa1d6b8 /core | |
| parent | fed762b944efb690b10ca2705f02343dda0aab03 (diff) | |
| parent | 54038acc8c5b85618911b9ca07403da365adfc97 (diff) | |
| download | frameworks_base-fbb1bb8ab7c0eda2dc6b53f06c86353151948b4b.zip frameworks_base-fbb1bb8ab7c0eda2dc6b53f06c86353151948b4b.tar.gz frameworks_base-fbb1bb8ab7c0eda2dc6b53f06c86353151948b4b.tar.bz2 | |
Merge "Update variable to reflect its true value."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 8033c9c..a973d64 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -784,6 +784,8 @@ class ZoomManager { && Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1))) { mInitialZoomOverview = false; setZoomScale(zoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale)); + } else { + mInZoomOverview = !exceedsMinScaleIncrement(mActualScale, zoomOverviewScale); } } |