From 8cbb4c6e30cff706a243599634aeb8fd9a818d92 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Mon, 24 Jan 2011 12:33:56 -0800 Subject: NULL inputType text fields should never show the IME. Bug 3381317 Changes made in https://android-git.corp.google.com/g/#change,91880 displayed the IME onFocus. However, the test was not consistent to what is done in touch event. textIsEditable is now checked too. Change-Id: If11382c1c90a557839b87d62494253470c42b621 --- core/java/android/inputmethodservice/InputMethodService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android/inputmethodservice/InputMethodService.java') diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index f35a43863457..255eb6c67db4 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -49,6 +49,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.animation.AnimationUtils; import android.view.inputmethod.CompletionInfo; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputBinding; @@ -56,7 +57,6 @@ import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; @@ -1024,7 +1024,7 @@ public class InputMethodService extends AbstractInputMethodService { * there is no hard keyboard or the keyboard is hidden. If you change what * this returns, you will need to call {@link #updateInputViewShown()} * yourself whenever the returned value may have changed to have it - * re-evalauted and applied. + * re-evaluated and applied. */ public boolean onEvaluateInputViewShown() { Configuration config = getResources().getConfiguration(); -- cgit v1.2.3