summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/ZoomManager.java
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-06-29 12:28:16 -0700
committerShimeng (Simon) Wang <swang@google.com>2011-06-29 12:28:16 -0700
commit50e04e2d45ad7eaa5305155779a8611ffb364d89 (patch)
treee1d30a93f25ceb91a4198a443d0697211dbc1caf /core/java/android/webkit/ZoomManager.java
parent9af04ac6fe4fae6464f0af2d690894aebdaad908 (diff)
Initial zoom overview flag only meaningful in page overview mode.
Change-Id: I206864678e61777276468718a78e3da8de4f06a7
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
-rw-r--r--core/java/android/webkit/ZoomManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 883656bd6fae..6c6974b468ec 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -1107,7 +1107,8 @@ class ZoomManager {
}
reflowText = exceedsMinScaleIncrement(mTextWrapScale, scale);
}
- mInitialZoomOverview = !exceedsMinScaleIncrement(scale, overviewScale);
+ mInitialZoomOverview = settings.getLoadWithOverviewMode() &&
+ !exceedsMinScaleIncrement(scale, overviewScale);
setZoomScale(scale, reflowText);
// update the zoom buttons as the scale can be changed