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

am 98fdda09: Merge change I86773fbb into eclair-mr2

Browse Source 
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp

* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
  If overview width is the same as the current width,
This commit is contained in:
Grace Kloba
2009-11-19 13:51:20 -08:00
committed by Android Git Automerger
parent 74dcb02f59 98fdda0925
commit 3003f30dde
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(); switchOutDrawHistory();
float scale = mActualScale * 0.8f; float scale = mActualScale * 0.8f;
if (scale < (mMinZoomScale + 0.1f) 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 // when zoom out to min scale, switch to overview mode
doDoubleTap(); doDoubleTap();
return true; return true;
@@ -4829,9 +4831,15 @@ public class WebView extends AbsoluteLayout
} }
settings.setDoubleTapToastCount(0); settings.setDoubleTapToastCount(0);
if (mInZoomOverview) { if (mInZoomOverview) {
// Force the titlebar fully reveal in overview mode float newScale = (float) getViewWidth() / mZoomOverviewWidth;
if (mScrollY < getTitleHeight()) mScrollY = 0; if (Math.abs(mActualScale - newScale) < 0.01f) {
zoomWithPreview((float) getViewWidth() / mZoomOverviewWidth); // 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 { } else {
// mLastTouchX and mLastTouchY are the point in the current viewport // mLastTouchX and mLastTouchY are the point in the current viewport
int contentX = viewToContentX((int) mLastTouchX + mScrollX); int contentX = viewToContentX((int) mLastTouchX + mScrollX);