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

am f167c4bf: DO NOT MERGE

Browse Source 
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp

* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
  DO NOT MERGE
This commit is contained in:
Grace Kloba
2010-01-18 23:43:37 -08:00
committed by Android Git Automerger
parent b869c59446 f167c4bfca
commit 76c29e633f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -4792,6 +4792,7 @@ public class WebView extends AbsoluteLayout
} }
} }
settings.setDoubleTapToastCount(0); settings.setDoubleTapToastCount(0);
boolean zoomToDefault = false;
if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS) if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS)
&& (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) { && (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) {
setNewZoomScale(mActualScale, true, true); setNewZoomScale(mActualScale, true, true);
@@ -4807,9 +4808,12 @@ public class WebView extends AbsoluteLayout
if (mScrollY < getTitleHeight()) mScrollY = 0; if (mScrollY < getTitleHeight()) mScrollY = 0;
zoomWithPreview(newScale); zoomWithPreview(newScale);
} else if (Math.abs(mActualScale - mDefaultScale) >= 0.01f) { } else if (Math.abs(mActualScale - mDefaultScale) >= 0.01f) {
mInZoomOverview = true; zoomToDefault = true;
} }
} else { } else {
zoomToDefault = true;
}
if (zoomToDefault) {
mInZoomOverview = false; mInZoomOverview = false;
int left = nativeGetBlockLeftEdge(mAnchorX, mAnchorY, mActualScale); int left = nativeGetBlockLeftEdge(mAnchorX, mAnchorY, mActualScale);
if (left != NO_LEFTEDGE) { if (left != NO_LEFTEDGE) {