diff options
Diffstat (limited to 'src/com/android/browser/BaseUi.java')
-rw-r--r-- | src/com/android/browser/BaseUi.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index da9ad639..4c17b8bc 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -428,14 +428,9 @@ public abstract class BaseUi implements UI { // container to the content view. FrameLayout wrapper = (FrameLayout) container.findViewById(R.id.webview_wrapper); - ViewGroup parent = (ViewGroup) mainView.getParent(); - if (parent != wrapper) { - if (parent != null) { - parent.removeView(mainView); - } - wrapper.addView(mainView); - } - parent = (ViewGroup) container.getParent(); + if (wrapper != mainView.getView().getParent()) + wrapper.addView(mainView.getView()); + ViewGroup parent = (ViewGroup) container.getParent(); if (parent != mContentView) { if (parent != null) { parent.removeView(container); @@ -458,7 +453,7 @@ public abstract class BaseUi implements UI { // needed by WebView. FrameLayout wrapper = (FrameLayout) container.findViewById(R.id.webview_wrapper); - wrapper.removeView(mainView); + wrapper.removeView(mainView.getView()); mContentView.removeView(container); mUiController.endActionMode(); mUiController.removeSubWindow(tab); |