diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-21 16:38:28 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 16:38:28 -0800 |
| commit | 25513d30801f7b18db02ed14fe92b9437faccb9e (patch) | |
| tree | 7f58e6e5f1e8363928e750bd5790729c720df9cf /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | a870ec2af4f1164fd1c15538a1cae0982344ed79 (diff) | |
| parent | e7eac906c0a14b644d457beeb73a407fa1b63673 (diff) | |
| download | latinime-25513d30801f7b18db02ed14fe92b9437faccb9e.tar.gz latinime-25513d30801f7b18db02ed14fe92b9437faccb9e.tar.xz latinime-25513d30801f7b18db02ed14fe92b9437faccb9e.zip | |
am e7eac906: Pending onStartInputView only if the EditorInfo is identical
* commit 'e7eac906c0a14b644d457beeb73a407fa1b63673':
Pending onStartInputView only if the EditorInfo is identical
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index e5a041f11..7d6efa584 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -301,9 +301,9 @@ public class Settings extends InputMethodSettingsActivity return mShowSettingsKey; } - public boolean isVoiceKeyEnabled(EditorInfo attribute) { + public boolean isVoiceKeyEnabled(EditorInfo editorInfo) { final boolean shortcutImeEnabled = SubtypeSwitcher.getInstance().isShortcutImeEnabled(); - final int inputType = (attribute != null) ? attribute.inputType : 0; + final int inputType = (editorInfo != null) ? editorInfo.inputType : 0; return shortcutImeEnabled && mVoiceKeyEnabled && !InputTypeCompatUtils.isPasswordInputType(inputType); } |