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

am 9f28d900: Merge change 25280 into eclair

Browse Source 
Merge commit '9f28d9008b96a1f7f3fd14634664d3991d756abf' into eclair-plus-aosp

* commit '9f28d9008b96a1f7f3fd14634664d3991d756abf':
  Don't scroll on load if titlebar is visible
This commit is contained in:
Cary Clark
2009-09-16 10:17:18 -07:00
committed by Android Git Automerger
parent 51173401f4 9f28d9008b
commit a78a157905
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4791,8 +4791,11 @@ public class WebView extends AbsoluteLayout
mMaxZoomScale = restoreState.mMaxScale;
}
setNewZoomScale(mLastScale, false);
setContentScrollTo(restoreState.mScrollX,
restoreState.mScrollY);
if (getVisibleTitleHeight() == 0
|| restoreState.mScrollY != 0) {
setContentScrollTo(restoreState.mScrollX,
restoreState.mScrollY);
}
if (useWideViewport
&& settings.getLoadWithOverviewMode()) {
if (restoreState.mViewScale == 0