diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-18 20:20:20 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-08-22 16:34:27 +0900 |
| commit | 8ffe4bc9321e582a4d882f21e465d5886616f489 (patch) | |
| tree | d87b69289b18a68d39a289e1e66ded06da583253 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 5a96395b78df7e201c580515ec9f54609a474a2d (diff) | |
| download | latinime-8ffe4bc9321e582a4d882f21e465d5886616f489.tar.gz latinime-8ffe4bc9321e582a4d882f21e465d5886616f489.tar.xz latinime-8ffe4bc9321e582a4d882f21e465d5886616f489.zip | |
[ML1] Introduce RichInputMethodSubtype
Bug: 11230254
Change-Id: Ic7a1bf938a5a186dcff527b556295aba2406e8b9
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 7cf4eff92..fc7a53a02 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -297,10 +297,14 @@ public final 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) { |