From 52051eb9ec50f0d7375557996fc3b44c3896e5a1 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 2 Aug 2011 13:06:43 -0700
Subject: make sure titlebar can be attached

     Bug: 5110201
     remove title bar from parent if it already has a parent

Change-Id: I9616605004da70b8162ae5bc19a40c1c0418dc55
---
 src/com/android/browser/XLargeUi.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com/android/browser')

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 301e09f4a..5c11b588d 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -25,6 +25,7 @@ import android.view.ActionMode;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebView;
 
@@ -94,6 +95,10 @@ public class XLargeUi extends BaseUi {
             }
             WebView web = getWebView();
             if (web != null) {
+                if (mTitleBar.getParent() != null) {
+                    ViewGroup p = (ViewGroup) mTitleBar.getParent();
+                    p.removeView(mTitleBar);
+                }
                 web.setEmbeddedTitleBar(mTitleBar);
                 // show url bar on scrolling
                 web.setOnTouchListener(this);
-- 
cgit v1.2.3