Merge "Fix layout params for TouchProxy"

1 files changed, 8 insertions, 43 deletions

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index e51962e..cfe7351 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -26,7 +26,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.webkit.WebView;
 
@@ -145,31 +144,10 @@ public class PhoneUi extends BaseUi {
         tab.getTopWindow().requestFocus();
     }
 
-    private void attachTitleBar(WebView mainView) {
-        if (mainView != null) {
-            mainView.setEmbeddedTitleBar(null);
-        }
-        WindowManager manager = (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE);
-        // Add the title bar to the window manager so it can receive
-        // touches while the menu is up
-        WindowManager.LayoutParams params =
-                new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                        WindowManager.LayoutParams.TYPE_APPLICATION,
-                        WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                        PixelFormat.OPAQUE);
-        params.gravity = Gravity.TOP;
-        boolean atTop = mainView.getScrollY() == 0;
-        params.windowAnimations = atTop ? 0 : R.style.TitleBar;
-        manager.addView(mTitleBar, params);
-        super.showTitleBar();
-    }
-
     @Override
     protected void showTitleBar() {
         if (canShowTitleBar()) {
-            WebView mainView = mUiController.getCurrentWebView();
-            attachTitleBar(mainView);
+            setTitleGravity(Gravity.TOP);
             super.showTitleBar();
         }
     }
@@ -177,23 +155,7 @@ public class PhoneUi extends BaseUi {
     @Override
     protected void hideTitleBar() {
         if (isTitleBarShowing()) {
-            WindowManager.LayoutParams params =
-                    (WindowManager.LayoutParams) mTitleBar.getLayoutParams();
-            WebView mainView = mUiController.getCurrentWebView();
-            // Although we decided whether or not to animate based on the
-            // current
-            // scroll position, the scroll position may have changed since the
-            // fake title bar was displayed. Make sure it has the appropriate
-            // animation/lack thereof before removing.
-            params.windowAnimations =
-                    mainView != null && mainView.getScrollY() == 0 ? 0 : R.style.TitleBar;
-            WindowManager manager =
-                    (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE);
-            manager.updateViewLayout(mTitleBar, params);
-            manager.removeView(mTitleBar);
-            if (mainView != null) {
-                mainView.setEmbeddedTitleBar(mTitleBar);
-            }
+            setTitleGravity(Gravity.NO_GRAVITY);
             super.hideTitleBar();
         }
     }
@@ -307,12 +269,15 @@ public class PhoneUi extends BaseUi {
 
         WindowManager.LayoutParams getWindowLayoutParams() {
             WindowManager.LayoutParams params =
-                new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
+                new WindowManager.LayoutParams(
+                        mTarget.getWidth(),
+                        mTarget.getHeight(),
                         WindowManager.LayoutParams.TYPE_APPLICATION,
                         WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
                         PixelFormat.TRANSPARENT);
-            params.gravity = Gravity.TOP;
+            params.gravity = Gravity.TOP | Gravity.LEFT;
+            params.y = mTarget.getTop();
+            params.x = mTarget.getLeft();
             return params;
         }
     }