summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-08-02 13:13:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-02 13:13:51 -0700
commit133d09d6cfb8afd9ac6dcea238c2f94eda6e46d4 (patch)
tree3218a42b79408d8755f9b135805482ee749e81a6 /src
parent42c0c063206ed37ab63b887348369650b51942e9 (diff)
parent52051eb9ec50f0d7375557996fc3b44c3896e5a1 (diff)
downloadpackages_apps_Browser-133d09d6cfb8afd9ac6dcea238c2f94eda6e46d4.tar.gz
packages_apps_Browser-133d09d6cfb8afd9ac6dcea238c2f94eda6e46d4.tar.bz2
packages_apps_Browser-133d09d6cfb8afd9ac6dcea238c2f94eda6e46d4.zip
Merge "make sure titlebar can be attached"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/XLargeUi.java5
1 files changed, 5 insertions, 0 deletions
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);