diff options
| author |   satok <satok@google.com> | 2011-01-14 00:25:36 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-14 00:25:36 -0800 |
| commit | e0df0fe957fee721365ab371d67206c1f90ecf24 (patch) | |
| tree | 11fbfab92a73da7c808fbdbb095e37f395325fa9 /java/src | |
| parent | a5d5a0ffbd96aea6e67c0f6fb29634ed00aed505 (diff) | |
| parent | 44757e1e731af6f9f6aff0b3dff94a43a6c5c988 (diff) | |
| download | latinime-e0df0fe957fee721365ab371d67206c1f90ecf24.tar.gz latinime-e0df0fe957fee721365ab371d67206c1f90ecf24.tar.xz latinime-e0df0fe957fee721365ab371d67206c1f90ecf24.zip | |
am 44757e1e: am 1c835437: Merge "Do not triggerVoiceIME at changing subtype if IME is not shown." into honeycomb
* commit '44757e1e731af6f9f6aff0b3dff94a43a6c5c988':
Do not triggerVoiceIME at changing subtype if IME is not shown.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index d696834e9..e1852b2ad 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -16,7 +16,6 @@ package com.android.inputmethod.latin; -import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.VoiceIMEConnector; @@ -433,6 +432,7 @@ public class SubtypeSwitcher { } private void triggerVoiceIME() { + if (!mService.isInputViewShown()) return; VoiceIMEConnector.getInstance().startListening(false, KeyboardSwitcher.getInstance().getInputView().getWindowToken(), false); } |