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

am 83f7bd0a: Merge change 26170 into eclair

Browse Source 
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp

* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
  Always interpret (0,0) scrolls as top of title bar.
This commit is contained in:
Leon Scroggins
2009-09-21 12:00:00 -07:00
committed by Android Git Automerger
parent c0d19fa1b8 83f7bd0a9b
commit 2aefa41a64
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2505,16 +2505,26 @@ public class WebView extends AbsoluteLayout
// saved scroll position, it is ok to skip this. // saved scroll position, it is ok to skip this.
return false; return false;
} }
int vx = contentToViewX(cx); int vx;
int vy = contentToViewY(cy); int vy;
if ((cx | cy) == 0) {
// If the page is being scrolled to (0,0), do not add in the title
// bar's height, and simply scroll to (0,0). (The only other work
// in contentToView_ is to multiply, so this would not change 0.)
vx = 0;
vy = 0;
} else {
vx = contentToViewX(cx);
vy = contentToViewY(cy);
}
// Log.d(LOGTAG, "content scrollTo [" + cx + " " + cy + "] view=[" + // Log.d(LOGTAG, "content scrollTo [" + cx + " " + cy + "] view=[" +
// vx + " " + vy + "]"); // vx + " " + vy + "]");
// Some mobile sites attempt to scroll the title bar off the page by // Some mobile sites attempt to scroll the title bar off the page by
// scrolling to (0,0) or (0,1). If we are at the top left corner of the // scrolling to (0,1). If we are at the top left corner of the
// page, assume this is an attempt to scroll off the title bar, and // page, assume this is an attempt to scroll off the title bar, and
// animate the title bar off screen slowly enough that the user can see // animate the title bar off screen slowly enough that the user can see
// it. // it.
if (cx == 0 && cy <= 1 && mScrollX == 0 && mScrollY == 0) { if (cx == 0 && cy == 1 && mScrollX == 0 && mScrollY == 0) {
pinScrollTo(vx, vy, true, SLIDE_TITLE_DURATION); pinScrollTo(vx, vy, true, SLIDE_TITLE_DURATION);
// Since we are animating, we have not yet reached the desired // Since we are animating, we have not yet reached the desired
// scroll position. Do not return true to request another attempt // scroll position. Do not return true to request another attempt
@@ -4862,17 +4872,8 @@ public class WebView extends AbsoluteLayout
mMaxZoomScale = restoreState.mMaxScale; mMaxZoomScale = restoreState.mMaxScale;
} }
setNewZoomScale(mLastScale, false); setNewZoomScale(mLastScale, false);
if (getTitleHeight() != 0 && restoreState.mScrollX == 0 setContentScrollTo(restoreState.mScrollX,
&& restoreState.mScrollY == 0) { restoreState.mScrollY);
// If there is a title bar, and the page is being
// restored to (0,0), do not scroll the title bar
// off the page.
abortAnimation();
scrollTo(0,0);
} else {
setContentScrollTo(restoreState.mScrollX,
restoreState.mScrollY);
}
if (useWideViewport if (useWideViewport
&& settings.getLoadWithOverviewMode()) { && settings.getLoadWithOverviewMode()) {
if (restoreState.mViewScale == 0 if (restoreState.mViewScale == 0