Merge change 25280 into eclair

* changes: Don't scroll on load if titlebar is visible
2009-09-16 13:12:56 -04:00
parent f7c3679f89 5b28c36644
commit 9f28d9008b
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -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