commit 7633540cf0d1cfa1f893dc827cddaca3ea272af7
author Shimeng (Simon) Wang <swang@google.com> Fri Jan 21 10:45:22 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 10:45:22 2011 -0800
tree db8d1235ce585db63361536cdd589c91a6ee6121
parent c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c
parent 66064914fc97f8b0a6cb1cc6e7a1266dd7cc4a3b

Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb

core/java/android/webkit/ZoomManager.java

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 9a050c5..b47fe86 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -232,12 +232,26 @@
     }
 
     private void setDefaultZoomScale(float defaultScale) {
+        final float originalDefault = mDefaultScale;
         mDefaultScale = defaultScale;
         mInvDefaultScale = 1 / defaultScale;
         mDefaultMaxZoomScale = defaultScale * DEFAULT_MAX_ZOOM_SCALE_FACTOR;
         mDefaultMinZoomScale = defaultScale * DEFAULT_MIN_ZOOM_SCALE_FACTOR;
-        mMaxZoomScale = mDefaultMaxZoomScale;
-        mMinZoomScale = mDefaultMinZoomScale;
+        if (originalDefault > 0.0 && mMaxZoomScale > 0.0) {
+            // Keeps max zoom scale when zoom density changes.
+            mMaxZoomScale = defaultScale / originalDefault * mMaxZoomScale;
+        } else {
+            mMaxZoomScale = mDefaultMaxZoomScale;
+        }
+        if (originalDefault > 0.0 && mMinZoomScale > 0.0) {
+            // Keeps min zoom scale when zoom density changes.
+            mMinZoomScale = defaultScale / originalDefault * mMinZoomScale;
+        } else {
+            mMinZoomScale = mDefaultMinZoomScale;
+        }
+        if (!exceedsMinScaleIncrement(mMinZoomScale, mMaxZoomScale)) {
+            mMaxZoomScale = mMinZoomScale;
+        }
     }
 
     public final float getScale() {
@@ -468,7 +482,7 @@
             mTextWrapScale = scale;
         }
 
-        if (scale != mActualScale || force) {
+        if (exceedsMinScaleIncrement(scale, mActualScale) || force) {
             float oldScale = mActualScale;
             float oldInvScale = mInvActualScale;