diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-22 09:41:46 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 09:41:46 +0000 |
| commit | 6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32 (patch) | |
| tree | 43c1adb59b6e1d67c19f4dc19483905496bb9ac9 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | eb99b461f03a48317598289ab12ea30a617c537c (diff) | |
| parent | a63d0a8ee6cb05bcddb69bf9a6018853d89d886a (diff) | |
| download | latinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.tar.gz latinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.tar.xz latinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.zip | |
Merge "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, 3 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 0d5ce7d6d..e43c18255 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -298,14 +298,10 @@ public class RichInputMethodManager { return INDEX_NOT_FOUND; } - public RichInputMethodSubtype getCurrentInputMethodSubtype( - final RichInputMethodSubtype defaultSubtype) { + public InputMethodSubtype getCurrentInputMethodSubtype( + final InputMethodSubtype defaultSubtype) { final InputMethodSubtype currentSubtype = mImmWrapper.mImm.getCurrentInputMethodSubtype(); - if (currentSubtype == null) { - return defaultSubtype; - } - // TODO: Determine locales to use for multi-lingual use. - return new RichInputMethodSubtype(currentSubtype); + return (currentSubtype != null) ? currentSubtype : defaultSubtype; } public boolean hasMultipleEnabledIMEsOrSubtypes(final boolean shouldIncludeAuxiliarySubtypes) { |