commit d463a727c54819de0b9d9062c659d30c5e0483a2
author Michael Kolb <kolby@google.com> Fri Apr 08 10:17:49 2011 -0700
committer Michael Kolb <kolby@google.com> Fri Apr 08 10:17:49 2011 -0700
tree f5b624b9f7bb2d00ceea3b22beab742fd2dfa4c9
parent 7b682c5e4bffb663ae93be060cb3bf118de4a710

fix page scroll when title focused

Change-Id: I457c11f8a52964c0f545827995f5165810222ff7

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index e661087..548292a 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -449,13 +449,13 @@
     protected abstract TitleBarBase getTitleBar();
 
     protected void setTitleGravity(int gravity) {
+        // update the titlebar layout params
+        // required to avoid scroll to top when focused
+        getTitleBar().setTitleGravity(gravity);
         WebView web = getWebView();
         if (web != null) {
             web.setTitleBarGravity(gravity);
         }
-        // update the titlebar layout params
-        // required to avoid scroll to top when focused
-        getTitleBar().setTitleGravity(gravity);
     }
 
     @Override

src/com/android/browser/TitleBarBase.java

diff --git a/src/com/android/browser/TitleBarBase.java b/src/com/android/browser/TitleBarBase.java
index 14ca554..d720257 100644
--- a/src/com/android/browser/TitleBarBase.java
+++ b/src/com/android/browser/TitleBarBase.java
@@ -154,8 +154,12 @@
 
     void setTitleGravity(int gravity) {
         int newTop = 0;
+        int newLeft = 0;
+        View parent = (View) getParent();
+        if (parent != null) {
+            newLeft = parent.getScrollX();
+        }
         if (gravity != Gravity.NO_GRAVITY) {
-            View parent = (View) getParent();
             if (parent != null) {
                 if (gravity == Gravity.TOP) {
                     newTop = parent.getScrollY();
@@ -165,6 +169,7 @@
         AbsoluteLayout.LayoutParams lp = (AbsoluteLayout.LayoutParams)
                 getLayoutParams();
         if (lp != null) {
+            lp.x = newLeft;
             lp.y = newTop;
             setLayoutParams(lp);
         }