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.
This commit is contained in:
satok 2011-01-14 00:25:36 -08:00 committed by Android Git Automerger
commit e0df0fe957

View file

@ -16,7 +16,6 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.SettingsUtil;
import com.android.inputmethod.voice.VoiceIMEConnector; import com.android.inputmethod.voice.VoiceIMEConnector;
@ -433,6 +432,7 @@ public class SubtypeSwitcher {
} }
private void triggerVoiceIME() { private void triggerVoiceIME() {
if (!mService.isInputViewShown()) return;
VoiceIMEConnector.getInstance().startListening(false, VoiceIMEConnector.getInstance().startListening(false,
KeyboardSwitcher.getInstance().getInputView().getWindowToken(), false); KeyboardSwitcher.getInstance().getInputView().getWindowToken(), false);
} }