diff options
| author | John Reck <jreck@google.com> | 2011-12-02 14:47:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-02 14:47:04 -0800 |
| commit | 43bc6b094edda6baa8123115a33afaf454525376 (patch) | |
| tree | 68cb7d7bcfab5c4c37f1dfa683f8dc8b3fe62841 /core/java/android | |
| parent | 1a3ece9f871c94eb524543ae618a2a1c88cab2cd (diff) | |
| parent | 059832790df137796c14371b3cbd19b6263c8280 (diff) | |
| download | frameworks_base-43bc6b094edda6baa8123115a33afaf454525376.zip frameworks_base-43bc6b094edda6baa8123115a33afaf454525376.tar.gz frameworks_base-43bc6b094edda6baa8123115a33afaf454525376.tar.bz2 | |
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/ZoomManager.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java index 8c57265..14bdc42 100644 --- a/core/java/android/webkit/ZoomManager.java +++ b/core/java/android/webkit/ZoomManager.java @@ -522,11 +522,12 @@ class ZoomManager { } public void updateDoubleTapZoom(int doubleTapZoom) { - if (mInZoomOverview) { - mDoubleTapZoomFactor = doubleTapZoom / 100.0f; - mTextWrapScale = getReadingLevelScale(); - refreshZoomScale(true); - } + boolean zoomIn = (mTextWrapScale - mActualScale) < .1f; + mDoubleTapZoomFactor = doubleTapZoom / 100.0f; + mTextWrapScale = getReadingLevelScale(); + float newScale = zoomIn ? mTextWrapScale + : Math.min(mTextWrapScale, mActualScale); + setZoomScale(newScale, true, true); } public void refreshZoomScale(boolean reflowText) { |