diff options
| author | Michael Kolb <kolby@google.com> | 2011-01-31 11:16:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 11:16:00 -0800 |
| commit | 2b2255d1860a54e62766db78ef8ed07553a1692e (patch) | |
| tree | c61a78ca0af60c98e288c90742303e0d725a1f31 /src/com/android | |
| parent | a4af6dce2ebe6c4979524461047fcc0eb76fce84 (diff) | |
| parent | 20776cc370cf1f092b73c356c02a0df966cfd185 (diff) | |
| download | packages_apps_Browser-2b2255d1860a54e62766db78ef8ed07553a1692e.tar.gz packages_apps_Browser-2b2255d1860a54e62766db78ef8ed07553a1692e.tar.bz2 packages_apps_Browser-2b2255d1860a54e62766db78ef8ed07553a1692e.zip | |
Merge "fix IME bug" into honeycomb
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BaseUi.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/TabBar.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 40bc16eb8..756f8b894 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -292,6 +292,7 @@ public abstract class BaseUi implements UI, WebViewFactory { } private void removeTabFromContentView(Tab tab) { + hideFakeTitleBar(); // Remove the container that contains the main WebView. WebView mainView = tab.getWebView(); View container = tab.getViewContainer(); @@ -301,6 +302,7 @@ public abstract class BaseUi implements UI, WebViewFactory { // Remove the container from the content and then remove the // WebView from the container. This will trigger a focus change // needed by WebView. + mainView.setEmbeddedTitleBar(null); FrameLayout wrapper = (FrameLayout) container.findViewById(R.id.webview_wrapper); wrapper.removeView(mainView); @@ -311,7 +313,6 @@ public abstract class BaseUi implements UI, WebViewFactory { if (errorConsole != null) { mErrorConsoleContainer.removeView(errorConsole); } - mainView.setEmbeddedTitleBar(null); } @Override diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java index df2e68a67..d115f1ac8 100644 --- a/src/com/android/browser/TabBar.java +++ b/src/com/android/browser/TabBar.java @@ -194,7 +194,6 @@ public class TabBar extends LinearLayout } public void onClick(View view) { - mUi.hideComboView(); if (mNewTab == view) { mUiController.openTabToHomePage(); } else if (mTabs.getSelectedTab() == view) { |