summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-04-16 09:51:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-16 09:51:05 -0700
commit891aded02d0f774f418aa10b169520667f8acddf (patch)
tree252b6c19b41a146a736194af793c5678dc30ec24 /src/com
parenta0a0d08b831bc1fc1e0de56350696d3ee8cc0be7 (diff)
parent4bb6fcb473ec4b2ce4cddf573280fd47f21a20c7 (diff)
downloadpackages_apps_Browser-891aded02d0f774f418aa10b169520667f8acddf.zip
packages_apps_Browser-891aded02d0f774f418aa10b169520667f8acddf.tar.gz
packages_apps_Browser-891aded02d0f774f418aa10b169520667f8acddf.tar.bz2
Merge "fix QuickControls url input IME"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/NavigationBarBase.java3
-rw-r--r--src/com/android/browser/UrlInputView.java5
2 files changed, 8 insertions, 0 deletions
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 @@ public class NavigationBarBase extends LinearLayout implements
} else if (mInVoiceMode) {
mUrlInput.showDropDown();
}
+ if (mTitleBar.useQuickControls()) {
+ mUrlInput.showIME();
+ }
}
public void onProgressStarted() {
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 @@ public class UrlInputView extends AutoCompleteTextView
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();