aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-10-14 18:15:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-14 18:15:00 -0700
commit2f45dbfc0d393fdb661bb42038137312e0d4b5f2 (patch)
treead149dd52d9b7d521945e96d36fcc819566eb0ee /java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
parenta4c07b215a6bd43cd57d5cc6d84d00363f5e8145 (diff)
parentace15025c3ccc2bb351490836c01958dfd45ca34 (diff)
downloadlatinime-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/KeyboardSwitcher.java')
-rw-r--r--java/src/com/android/inputmethod/latin/KeyboardSwitcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 86dbf1f60..a7b695eb3 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -260,7 +260,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
mMode = mode;
mImeOptions = imeOptions;
if (enableVoice != mHasVoice) {
- setVoiceMode(mHasVoice, mVoiceOnPrimary);
+ // TODO clean up this unnecessary recursive call.
+ setVoiceMode(enableVoice, mVoiceOnPrimary);
}
mIsSymbols = isSymbols;