diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-08-22 09:48:39 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 09:48:39 +0000 |
| commit | 9df7e3b8e941dcfdf30ab2262530d08b45051737 (patch) | |
| tree | 8a93b513e98b0bdff6e96142a4bd1c1539bacece /java/src/com/android/inputmethod/compat | |
| parent | bf55d9f0e694202bbe11ddbf985fa9f6729acc25 (diff) | |
| parent | 6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32 (diff) | |
| download | latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.tar.gz latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.tar.xz latinime-9df7e3b8e941dcfdf30ab2262530d08b45051737.zip | |
am 6c638d1b: Merge "Revert "[ML1] Introduce RichInputMethodSubtype""
* commit '6c638d1bbdd4b1b8d49531ef41d337bd3ccbec32':
Revert "[ML1] Introduce RichInputMethodSubtype"
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java | 9 |
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 |