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

DO NOT MERGE

Browse Source 
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
This commit is contained in:
Grace Kloba
2010-01-15 17:11:27 -08:00
parent 17b14bd36a
commit f167c4bfca
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);
boolean zoomToDefault = false;
if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS)
&& (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) {
setNewZoomScale(mActualScale, true, true);
@@ -4807,9 +4808,12 @@ public class WebView extends AbsoluteLayout
if (mScrollY < getTitleHeight()) mScrollY = 0;
zoomWithPreview(newScale);
} else if (Math.abs(mActualScale - mDefaultScale) >= 0.01f) {
mInZoomOverview = true;
zoomToDefault = true;
}
} else {
zoomToDefault = true;
}
if (zoomToDefault) {
mInZoomOverview = false;
int left = nativeGetBlockLeftEdge(mAnchorX, mAnchorY, mActualScale);
if (left != NO_LEFTEDGE) {