diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-25 05:30:53 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 05:30:53 +0000 |
| commit | adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70 (patch) | |
| tree | 6eb8f4a2d529df53d7379a31fbb35656f16327f4 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | aec45a533672df82ad5af1c0c0fdf045bccc8256 (diff) | |
| parent | dc44260484a27d360c48daa069e7f3b7c07d12a2 (diff) | |
| download | latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.tar.gz latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.tar.xz latinime-adfb74a41e8a42d4e2276b6b42eded8c6ccf2b70.zip | |
am dc442604: Merge "Revert "Revert "[ML1] Introduce RichInputMethodSubtype"""
* commit 'dc44260484a27d360c48daa069e7f3b7c07d12a2':
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) { |