commit 891aded02d0f774f418aa10b169520667f8acddf
author Michael Kolb <kolby@google.com> Mon Apr 16 09:51:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 09:51:05 2012 -0700
tree 252b6c19b41a146a736194af793c5678dc30ec24
parent a0a0d08b831bc1fc1e0de56350696d3ee8cc0be7
parent 4bb6fcb473ec4b2ce4cddf573280fd47f21a20c7

Merge "fix QuickControls url input IME"

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index ed96257..41af619 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -261,6 +261,9 @@
         } else if (mInVoiceMode) {
             mUrlInput.showDropDown();
         }
+        if (mTitleBar.useQuickControls()) {
+            mUrlInput.showIME();
+        }
     }
 
     public void onProgressStarted() {

src/com/android/browser/UrlInputView.java

diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 2f0c6a8..1ba26fe 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -250,6 +250,11 @@
         mInputManager.hideSoftInputFromWindow(getWindowToken(), 0);
     }
 
+    void showIME() {
+        mInputManager.focusIn(this);
+        mInputManager.showSoftInput(this, 0);
+    }
+
     private void finishInput(String url, String extra, String source) {
         mNeedsUpdate = true;
         dismissDropDown();