commit 74e60c2d77ee84e6f2b5311dc465e2933d304fb8
author Michael Kolb <kolby@google.com> Sat Apr 30 16:43:47 2011 -0700
committer Michael Kolb <kolby@google.com> Sat Apr 30 17:09:56 2011 -0700
tree bf4a98202487cfbe1cc763a5ab316c5ae98ed542
parent 5a4372f4638f9a1fc5c052d85977fbcc0c4d8c55

fix url editing scroll bug

    Bug: 4262017

Change-Id: I95991847277ece1027e0e9a9d1f6591910ae3ff4

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 20195ad..7530732 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -459,9 +459,6 @@
     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);

src/com/android/browser/TitleBarBase.java

diff --git a/src/com/android/browser/TitleBarBase.java b/src/com/android/browser/TitleBarBase.java
index 7897b65..4dc960c 100644
--- a/src/com/android/browser/TitleBarBase.java
+++ b/src/com/android/browser/TitleBarBase.java
@@ -27,11 +27,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.PaintDrawable;
 import android.os.Bundle;
 import android.speech.RecognizerResultsIntent;
 import android.text.TextUtils;
@@ -51,7 +47,6 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
@@ -149,29 +144,6 @@
         mSkipTitleBarAnimations = skip;
     }
 
-    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) {
-            if (parent != null) {
-                if (gravity == Gravity.TOP) {
-                    newTop = parent.getScrollY();
-                }
-            }
-        }
-        AbsoluteLayout.LayoutParams lp = (AbsoluteLayout.LayoutParams)
-                getLayoutParams();
-        if (lp != null) {
-            lp.x = newLeft;
-            lp.y = newTop;
-            setLayoutParams(lp);
-        }
-    }
-
     void show() {
         if (mUseQuickControls) {
             mParent.addView(this);

src/com/android/browser/UrlInputView.java

diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 18d0215..7545e6a 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -296,4 +296,13 @@
     void registerDropdownChangeListener(DropdownChangeListener d) {
         mDropdownListener = d;
     }
+
+    /*
+     * no-op to prevent scrolling of webview when embedded titlebar
+     * gets edited
+     */
+    @Override
+    public boolean requestRectangleOnScreen(Rect rect, boolean immediate) {
+        return false;
+    }
 }