aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/compat
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-08-22 09:40:27 +0000
committerJean Chalard <jchalard@google.com>2014-08-22 09:40:27 +0000
commita63d0a8ee6cb05bcddb69bf9a6018853d89d886a (patch)
treef646b2a11bd408bfd0069432b108e36af75ed1eb /java/src/com/android/inputmethod/compat
parent8ffe4bc9321e582a4d882f21e465d5886616f489 (diff)
downloadlatinime-a63d0a8ee6cb05bcddb69bf9a6018853d89d886a.tar.gz
latinime-a63d0a8ee6cb05bcddb69bf9a6018853d89d886a.tar.xz
latinime-a63d0a8ee6cb05bcddb69bf9a6018853d89d886a.zip
Revert "[ML1] Introduce RichInputMethodSubtype"
This reverts commit 8ffe4bc9321e582a4d882f21e465d5886616f489. Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
-rw-r--r--java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java
index 3abfa3fc9..365867257 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java
@@ -20,7 +20,7 @@ import android.os.Build;
import android.view.inputmethod.InputMethodSubtype;
import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
+import com.android.inputmethod.latin.Constants;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -64,12 +64,9 @@ public final class InputMethodSubtypeCompatUtils {
overridesImplicitlyEnabledSubtype, id);
}
- public static boolean isAsciiCapable(final RichInputMethodSubtype subtype) {
- return isAsciiCapable(subtype.getRawSubtype());
- }
-
public static boolean isAsciiCapable(final InputMethodSubtype subtype) {
- return InputMethodSubtypeCompatUtils.isAsciiCapableWithAPI(subtype);
+ return isAsciiCapableWithAPI(subtype)
+ || subtype.containsExtraValueKey(Constants.Subtype.ExtraValue.ASCII_CAPABLE);
}
@UsedForTesting