Merge "Support BOOKMARK_TYPE"
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index be38928..652f9d7 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -312,26 +312,16 @@
ViewGroup parent = (ViewGroup) mainView.getParent();
if (parent != wrapper) {
if (parent != null) {
- Log.w(LOGTAG, "mMainView already has a parent in"
- + " attachTabToContentView!");
parent.removeView(mainView);
}
wrapper.addView(mainView);
- } else {
- Log.w(LOGTAG, "mMainView is already attached to wrapper in"
- + " attachTabToContentView!");
}
parent = (ViewGroup) container.getParent();
if (parent != mContentView) {
if (parent != null) {
- Log.w(LOGTAG, "mContainer already has a parent in"
- + " attachTabToContentView!");
parent.removeView(container);
}
mContentView.addView(container, COVER_SCREEN_PARAMS);
- } else {
- Log.w(LOGTAG, "mContainer is already attached to content in"
- + " attachTabToContentView!");
}
mUiController.attachSubWindow(tab);
}
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 78a30d6..fdad0d8 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -788,8 +788,10 @@
mLoadStopped = true;
Tab tab = mTabControl.getCurrentTab();
WebView w = getCurrentTopWebView();
- w.stopLoading();
- mUi.onPageStopped(tab);
+ if (w != null) {
+ w.stopLoading();
+ mUi.onPageStopped(tab);
+ }
}
boolean didUserStopLoading() {
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 128304c..ed96257 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -108,7 +108,6 @@
}
if (hasFocus) {
mBaseUi.showTitleBar();
- mUrlInput.forceIme();
if (mInVoiceMode) {
mUrlInput.forceFilter();
}
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 3c0de30..2f0c6a8 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -246,11 +246,6 @@
showDropDown();
}
- void forceIme() {
- mInputManager.focusIn(this);
- mInputManager.showSoftInput(this, 0);
- }
-
void hideIME() {
mInputManager.hideSoftInputFromWindow(getWindowToken(), 0);
}