From a63d0a8ee6cb05bcddb69bf9a6018853d89d886a Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 22 Aug 2014 09:40:27 +0000 Subject: Revert "[ML1] Introduce RichInputMethodSubtype" This reverts commit 8ffe4bc9321e582a4d882f21e465d5886616f489. Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f --- .../com/android/inputmethod/latin/RichInputMethodManager.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java') diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index fc7a53a02..7cf4eff92 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -297,14 +297,10 @@ public final 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) { -- cgit v1.2.3-83-g751a