Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1

Browse Source 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
This commit is contained in:
John Reck
2011-12-02 14:49:19 -08:00
committed by Android Git Automerger
parent 9f3f3c2fbe 43bc6b094e
commit 6d3e51d4c4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/webkit/ZoomManager.java
View File

@@ -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) {