diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-17 00:29:01 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-17 00:29:01 -0800 |
| commit | 93441101aca31dffee8cbe309ec9ed1e259dfbe3 (patch) | |
| tree | 36fc2ba26885e738866e7311be958ab1be620058 /java/src/com/android/inputmethod/latin | |
| parent | 3c4213ea0e779ce2036552d57fbcbb2a630edade (diff) | |
| parent | 3dd6bdf9312007ed43827975d121e972b98ab5e3 (diff) | |
| download | latinime-93441101aca31dffee8cbe309ec9ed1e259dfbe3.tar.gz latinime-93441101aca31dffee8cbe309ec9ed1e259dfbe3.tar.xz latinime-93441101aca31dffee8cbe309ec9ed1e259dfbe3.zip | |
am 3dd6bdf9: Merge "Add InputMethodSubtypeCompatUtils.isAsciiCapable()"
* commit '3dd6bdf9312007ed43827975d121e972b98ab5e3':
Add InputMethodSubtypeCompatUtils.isAsciiCapable()
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/AdditionalSubtypeSettings.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/AdditionalSubtypeSettings.java b/java/src/com/android/inputmethod/latin/settings/AdditionalSubtypeSettings.java index 4bf524cbb..6dae6206c 100644 --- a/java/src/com/android/inputmethod/latin/settings/AdditionalSubtypeSettings.java +++ b/java/src/com/android/inputmethod/latin/settings/AdditionalSubtypeSettings.java @@ -16,8 +16,6 @@ package com.android.inputmethod.latin.settings; -import static com.android.inputmethod.latin.Constants.Subtype.ExtraValue.ASCII_CAPABLE; - import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; @@ -44,6 +42,8 @@ import android.widget.Spinner; import android.widget.SpinnerAdapter; import android.widget.Toast; +import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils; +import com.android.inputmethod.latin.Constants; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; @@ -111,7 +111,7 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { subtype.getLocale(), subtype.hashCode(), subtype.hashCode(), SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(subtype))); } - if (subtype.containsExtraValueKey(ASCII_CAPABLE)) { + if (InputMethodSubtypeCompatUtils.isAsciiCapable(subtype)) { items.add(createItem(context, subtype.getLocale())); } } @@ -287,7 +287,7 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { final KeyboardLayoutSetItem layout = (KeyboardLayoutSetItem) mKeyboardLayoutSetSpinner.getSelectedItem(); final InputMethodSubtype subtype = AdditionalSubtypeUtils.createAdditionalSubtype( - locale.first, layout.first, ASCII_CAPABLE); + locale.first, layout.first, Constants.Subtype.ExtraValue.ASCII_CAPABLE); setSubtype(subtype); notifyChanged(); if (isEditing) { |