aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/compat
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-08-22 09:41:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-22 09:41:46 +0000
commit6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32 (patch)
tree43c1adb59b6e1d67c19f4dc19483905496bb9ac9 /java/src/com/android/inputmethod/compat
parenteb99b461f03a48317598289ab12ea30a617c537c (diff)
parenta63d0a8ee6cb05bcddb69bf9a6018853d89d886a (diff)
downloadlatinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.tar.gz
latinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.tar.xz
latinime-6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32.zip
Merge "Revert "[ML1] Introduce RichInputMethodSubtype""
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