diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 05:24:27 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 05:24:28 +0000 |
| commit | dc44260484a27d360c48daa069e7f3b7c07d12a2 (patch) | |
| tree | 84adf046ea2ff1f9a1e9538a5523e67ea286d2fc /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 394677674bffec54f8e04dd84468128232d248aa (diff) | |
| parent | 85ddfe1317a4475269e53f62c2338c335e02e839 (diff) | |
| download | latinime-dc44260484a27d360c48daa069e7f3b7c07d12a2.tar.gz latinime-dc44260484a27d360c48daa069e7f3b7c07d12a2.tar.xz latinime-dc44260484a27d360c48daa069e7f3b7c07d12a2.zip | |
Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodManager.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index e43c18255..0d5ce7d6d 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -298,10 +298,14 @@ public class RichInputMethodManager { return INDEX_NOT_FOUND; } - public InputMethodSubtype getCurrentInputMethodSubtype( - final InputMethodSubtype defaultSubtype) { + public RichInputMethodSubtype getCurrentInputMethodSubtype( + final RichInputMethodSubtype defaultSubtype) { final InputMethodSubtype currentSubtype = mImmWrapper.mImm.getCurrentInputMethodSubtype(); - return (currentSubtype != null) ? currentSubtype : defaultSubtype; + if (currentSubtype == null) { + return defaultSubtype; + } + // TODO: Determine locales to use for multi-lingual use. + return new RichInputMethodSubtype(currentSubtype); } public boolean hasMultipleEnabledIMEsOrSubtypes(final boolean shouldIncludeAuxiliarySubtypes) { |