diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-22 07:49:11 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 07:49:11 +0000 |
| commit | 543efa296ebd08ba1bb68a8022670079e74cce7a (patch) | |
| tree | 552b2ecd7dd585080bed36e5bb038bb396cdd0db /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 01d9955e8accf514dfc0b1d6590e7b9ab5c357b0 (diff) | |
| parent | f429d8f138d7e9aed8cdae774bfc8854025d3a40 (diff) | |
| download | latinime-543efa296ebd08ba1bb68a8022670079e74cce7a.tar.gz latinime-543efa296ebd08ba1bb68a8022670079e74cce7a.tar.xz latinime-543efa296ebd08ba1bb68a8022670079e74cce7a.zip | |
am f429d8f1: Merge "[ML1] Introduce RichInputMethodSubtype"
* commit 'f429d8f138d7e9aed8cdae774bfc8854025d3a40':
[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) { |