diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-30 13:55:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 13:55:10 -0700 |
| commit | 56528a3546777bd6e6739b0d99d67ec7598e06ea (patch) | |
| tree | e84735adb71de27dddcbedc4adb7345e0ea99671 /core/java/android/webkit/ZoomManager.java | |
| parent | 5612b3d1252b8cb850745b3a35948b47561fa1fc (diff) | |
| parent | 72a1d2e1386fcf1795621c2eeb05287d46c7278c (diff) | |
Merge "Keep initial zoom overview for non-standard load."
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 6c6974b468ec..7d43e94ff695 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -1024,6 +1024,11 @@ class ZoomManager { } else { mInZoomOverview = !scaleHasDiff; } + if (drawData.mFirstLayoutForNonStandardLoad && settings.getLoadWithOverviewMode()) { + // Set mInitialZoomOverview in case this is the first picture for non standard load, + // so next new picture could be forced into overview mode if it's true. + mInitialZoomOverview = mInZoomOverview; + } } /** |