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

Merge change I86773fbb into eclair-mr2

Browse Source 
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
This commit is contained in:
Android (Google) Code Review
2009-11-19 13:47:24 -08:00
parent 57534f1b9f 86773fbb4e
commit 98fdda0925
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4682,7 +4682,9 @@ public class WebView extends AbsoluteLayout
switchOutDrawHistory();
float scale = mActualScale * 0.8f;
if (scale < (mMinZoomScale + 0.1f)
&& mWebViewCore.getSettings().getUseWideViewPort()) {
&& mWebViewCore.getSettings().getUseWideViewPort()
&& mZoomOverviewWidth > Math.ceil(getViewWidth()
* mInvActualScale)) {
// when zoom out to min scale, switch to overview mode
doDoubleTap();
return true;
@@ -4829,9 +4831,15 @@ public class WebView extends AbsoluteLayout
}
settings.setDoubleTapToastCount(0);
if (mInZoomOverview) {
// Force the titlebar fully reveal in overview mode
if (mScrollY < getTitleHeight()) mScrollY = 0;
zoomWithPreview((float) getViewWidth() / mZoomOverviewWidth);
float newScale = (float) getViewWidth() / mZoomOverviewWidth;
if (Math.abs(mActualScale - newScale) < 0.01f) {
// reset mInZoomOverview to false if scale doesn't change
mInZoomOverview = false;
} else {
// Force the titlebar fully reveal in overview mode
if (mScrollY < getTitleHeight()) mScrollY = 0;
zoomWithPreview(newScale);
}
} else {
// mLastTouchX and mLastTouchY are the point in the current viewport
int contentX = viewToContentX((int) mLastTouchX + mScrollX);