Clean up from earlier changes to place title bar at top of WebView

Rename addTitleBar to setEmbeddedTitleBar.  This requires a change
to packages/apps/Browser.  Also remove mTitleBar if there already
was one.

In ViewManager, call contentToViewDimension where appropriate.

Change-Id: If4d378fad192990253411924a9a80bee96e63ff2

1 files changed, 13 insertions, 5 deletions

diff --git a/core/java/android/webkit/ViewManager.java b/core/java/android/webkit/ViewManager.java
index 63f4033..6a838c3 100644
--- a/core/java/android/webkit/ViewManager.java
+++ b/core/java/android/webkit/ViewManager.java
@@ -50,7 +50,7 @@ class ViewManager {
             }
             setBounds(x, y, width, height);
             final AbsoluteLayout.LayoutParams lp =
-                    new AbsoluteLayout.LayoutParams(ctvX(width), ctvX(height),
+                    new AbsoluteLayout.LayoutParams(ctvD(width), ctvD(height),
                             ctvX(x), ctvY(y));
             mWebView.mPrivateHandler.post(new Runnable() {
                 public void run() {
@@ -98,9 +98,17 @@ class ViewManager {
     }
 
     /**
+     * Shorthand for calling mWebView.contentToViewDimension.  Used when
+     * obtaining a view dimension from a content dimension, whether it be in x
+     * or y.
+     */
+    private int ctvD(int val) {
+        return mWebView.contentToViewDimension(val);
+    }
+
+    /**
      * Shorthand for calling mWebView.contentToViewX.  Used when obtaining a
-     * view x coordinate from a content x coordinate, or when getting a
-     * view dimension from a content dimension, whether it be in x or y.
+     * view x coordinate from a content x coordinate.
      */
     private int ctvX(int val) {
         return mWebView.contentToViewX(val);
@@ -119,8 +127,8 @@ class ViewManager {
             View view = v.mView;
             AbsoluteLayout.LayoutParams lp =
                     (AbsoluteLayout.LayoutParams) view.getLayoutParams();
-            lp.width = ctvX(v.width);
-            lp.height = ctvX(v.height);
+            lp.width = ctvD(v.width);
+            lp.height = ctvD(v.height);
             lp.x = ctvX(v.x);
             lp.y = ctvY(v.y);
             view.setLayoutParams(lp);