diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-10-14 18:15:00 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 18:15:00 -0700 |
| commit | 2f45dbfc0d393fdb661bb42038137312e0d4b5f2 (patch) | |
| tree | ad149dd52d9b7d521945e96d36fcc819566eb0ee /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | a4c07b215a6bd43cd57d5cc6d84d00363f5e8145 (diff) | |
| parent | ace15025c3ccc2bb351490836c01958dfd45ca34 (diff) | |
| download | latinime-2f45dbfc0d393fdb661bb42038137312e0d4b5f2.tar.gz latinime-2f45dbfc0d393fdb661bb42038137312e0d4b5f2.tar.xz latinime-2f45dbfc0d393fdb661bb42038137312e0d4b5f2.zip | |
am ace15025: Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread
Merge commit 'ace15025c3ccc2bb351490836c01958dfd45ca34' into gingerbread-plus-aosp
* commit 'ace15025c3ccc2bb351490836c01958dfd45ca34':
Follow up change of I8b38e280 (DO NOT MERGE)
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 4e0f7c56b..b6fee1170 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2329,8 +2329,8 @@ public class LatinIME extends InputMethodService private boolean shouldShowVoiceButton(FieldContext fieldContext, EditorInfo attribute) { return ENABLE_VOICE_BUTTON && fieldCanDoVoice(fieldContext) - && !(attribute != null && attribute.privateImeOptions != null - && attribute.privateImeOptions.equals(IME_OPTION_NO_MICROPHONE)) + && !(attribute != null + && IME_OPTION_NO_MICROPHONE.equals(attribute.privateImeOptions)) && SpeechRecognizer.isRecognitionAvailable(this); } |