diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-09 12:02:06 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 12:02:06 +0000 |
| commit | 4099611d64923b9d92bf5a3ff43fc63306b6c382 (patch) | |
| tree | 32256dd961d097541327ced17498c9650d6685b4 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 12250e24921f59075dabe1642bc47bf263b77f37 (diff) | |
| parent | 437fcbaa9f9e7de6ccdb6c9ac5f977c0aa6e6bc6 (diff) | |
| download | latinime-4099611d64923b9d92bf5a3ff43fc63306b6c382.tar.gz latinime-4099611d64923b9d92bf5a3ff43fc63306b6c382.tar.xz latinime-4099611d64923b9d92bf5a3ff43fc63306b6c382.zip | |
am 437fcbaa: [ML20.1] Move getRichInputMethodSubtype to additional features
* commit '437fcbaa9f9e7de6ccdb6c9ac5f977c0aa6e6bc6':
[ML20.1] Move getRichInputMethodSubtype to additional features
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 0d5ce7d6d..b4ec8d674 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -29,6 +29,7 @@ import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; +import com.android.inputmethod.latin.settings.AdditionalFeaturesSettingUtils; import com.android.inputmethod.latin.settings.Settings; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; @@ -304,8 +305,7 @@ public class RichInputMethodManager { if (currentSubtype == null) { return defaultSubtype; } - // TODO: Determine locales to use for multi-lingual use. - return new RichInputMethodSubtype(currentSubtype); + return AdditionalFeaturesSettingUtils.getRichInputMethodSubtype(this, currentSubtype); } public boolean hasMultipleEnabledIMEsOrSubtypes(final boolean shouldIncludeAuxiliarySubtypes) { |