aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-01-14 13:16:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-14 13:16:13 -0800
commit4a3c68a75a141ecbc3302843597497c7f7d3ad95 (patch)
treedc592974c981fdad9bf1b37d15304207c9d6fec9 /java/src
parent0b971df9e3793a5ae1bc24368b38a105c3015f11 (diff)
parent67e08bb0fb922532d21e9a03c4e1627f62703935 (diff)
downloadlatinime-4a3c68a75a141ecbc3302843597497c7f7d3ad95.tar.gz
latinime-4a3c68a75a141ecbc3302843597497c7f7d3ad95.tar.xz
latinime-4a3c68a75a141ecbc3302843597497c7f7d3ad95.zip
am 67e08bb0: Invoke voice recognition certainly onStartInputView
* commit '67e08bb0fb922532d21e9a03c4e1627f62703935': Invoke voice recognition certainly onStartInputView
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/voice/VoiceIMEConnector.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
index d9528eb40..1ac4391f1 100644
--- a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
+++ b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
@@ -630,9 +630,15 @@ public class VoiceIMEConnector implements VoiceInput.UiListener {
public void onStartInputView(IBinder token) {
// If IME is in voice mode, but still needs to show the voice warning dialog,
// keep showing the warning.
- if (mSubtypeSwitcher.isVoiceMode() && needsToShowWarningDialog() && token != null) {
- showVoiceWarningDialog(false, token, false);
+ if (mSubtypeSwitcher.isVoiceMode() && token != null) {
+ if (needsToShowWarningDialog()) {
+ showVoiceWarningDialog(false, token, false);
+ } else {
+ startListening(false, token, false);
+ }
}
+ // If we have no token, onAttachedToWindow will take care of showing dialog and start
+ // listening.
}
public void onAttachedToWindow() {