diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2010-10-20 00:18:50 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2010-10-20 22:51:33 +0900 |
| commit | e354a85ef44e13999aaefd735cef7f659090f6e8 (patch) | |
| tree | 805a33fcfd6e2853062b06ab36cbb40f5a5e37b6 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 58bfa350726c6a9b6b41e44e0313a2a366dab3d2 (diff) | |
| download | latinime-e354a85ef44e13999aaefd735cef7f659090f6e8.tar.gz latinime-e354a85ef44e13999aaefd735cef7f659090f6e8.tar.xz latinime-e354a85ef44e13999aaefd735cef7f659090f6e8.zip | |
Manual merge of the following Gingerbread changes logically
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa
bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
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 edda9e866..bb29e6367 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2333,8 +2333,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); } |