diff options
| author |   satok <satok@google.com> | 2011-02-04 00:30:11 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-02-04 00:30:11 -0800 |
| commit | 8dac5fe98d586b5bea9f18ed3d8f2cc4d3588102 (patch) | |
| tree | 0b3f7d2b28e71159c0781bae078608904a2ca6e8 /java/src | |
| parent | fdb2225803918981558dfb9e568dbb96f7d0673a (diff) | |
| parent | c98a943edaf03bb114172b31b041b0a6b952c043 (diff) | |
| download | latinime-8dac5fe98d586b5bea9f18ed3d8f2cc4d3588102.tar.gz latinime-8dac5fe98d586b5bea9f18ed3d8f2cc4d3588102.tar.xz latinime-8dac5fe98d586b5bea9f18ed3d8f2cc4d3588102.zip | |
Merge "Duplicate enabled languages when there is only one enabled language"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 9 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/voice/VoiceIMEConnector.java | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index f4262cc99..d8c89a0d4 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -426,8 +426,15 @@ public class SubtypeSwitcher { if (mConfigUseSpacebarLanguageSwitcher) { return mLanguageSwitcher.getEnabledLanguages(); } else { + int enabledLanguageCount = mEnabledLanguagesOfCurrentInputMethod.size(); + // Workaround for explicitly specifying the voice language + if (enabledLanguageCount == 1) { + mEnabledLanguagesOfCurrentInputMethod.add( + mEnabledLanguagesOfCurrentInputMethod.get(0)); + ++enabledLanguageCount; + } return mEnabledLanguagesOfCurrentInputMethod.toArray( - new String[mEnabledLanguagesOfCurrentInputMethod.size()]); + new String[enabledLanguageCount]); } } diff --git a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java index 4ceaa1bb9..277ef7e65 100644 --- a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java +++ b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java @@ -81,7 +81,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { private static final int RECOGNITIONVIEW_HEIGHT_THRESHOLD_RATIO = 6; private static final String TAG = VoiceIMEConnector.class.getSimpleName(); - private static boolean DEBUG = LatinImeLogger.sDBG; + private static final boolean DEBUG = LatinImeLogger.sDBG; private boolean mAfterVoiceInput; private boolean mHasUsedVoiceInput; @@ -715,7 +715,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { mHandler.updateVoiceResults(); } - public FieldContext makeFieldContext() { + private FieldContext makeFieldContext() { SubtypeSwitcher switcher = SubtypeSwitcher.getInstance(); return new FieldContext(mService.getCurrentInputConnection(), mService.getCurrentInputEditorInfo(), switcher.getInputLocaleStr(), |