diff options
| author | Jean Chalard <jchalard@google.com> | 2014-08-22 09:40:27 +0000 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-08-22 09:40:27 +0000 |
| commit | a63d0a8ee6cb05bcddb69bf9a6018853d89d886a (patch) | |
| tree | f646b2a11bd408bfd0069432b108e36af75ed1eb /java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java | |
| parent | 8ffe4bc9321e582a4d882f21e465d5886616f489 (diff) | |
Revert "[ML1] Introduce RichInputMethodSubtype"
This reverts commit 8ffe4bc9321e582a4d882f21e465d5886616f489.
Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java b/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java index 72ad2bd97..6400a2440 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java +++ b/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java @@ -18,7 +18,6 @@ package com.android.inputmethod.keyboard.internal; import android.view.inputmethod.InputMethodSubtype; -import com.android.inputmethod.latin.RichInputMethodSubtype; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import java.util.Collections; @@ -35,8 +34,8 @@ public final class LanguageOnSpacebarHelper { private List<InputMethodSubtype> mEnabledSubtypes = Collections.emptyList(); private boolean mIsSystemLanguageSameAsInputLanguage; - public int getLanguageOnSpacebarFormatType(final RichInputMethodSubtype subtype) { - if (subtype.isNoLanguage()) { + public int getLanguageOnSpacebarFormatType(final InputMethodSubtype subtype) { + if (SubtypeLocaleUtils.isNoLanguage(subtype)) { return FORMAT_TYPE_FULL_LOCALE; } // Only this subtype is enabled and equals to the system locale. |