diff options
| author | Ken Wakasa <kwakasa@google.com> | 2014-10-03 23:50:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 23:50:01 +0000 |
| commit | 46fcb3f91fcd413e6cf600a763b7edf59d0bd966 (patch) | |
| tree | 58924005be0ba3497a2e01d0137f717b3d74b9ab /java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java | |
| parent | 37ba3ddd542274819abfc024529ffbcd8f2e1790 (diff) | |
| parent | faefad5b0fd5b188d7eefa66dfaf33c47e181c03 (diff) | |
Merge "Revert "[ML14] Forward the locale list to relevant places""
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java b/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java index 21eaed950..72ad2bd97 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java +++ b/java/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelper.java @@ -23,7 +23,6 @@ import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import java.util.Collections; import java.util.List; -import java.util.Locale; /** * This class determines that the language name on the spacebar should be displayed in what format. @@ -32,7 +31,6 @@ public final class LanguageOnSpacebarHelper { public static final int FORMAT_TYPE_NONE = 0; public static final int FORMAT_TYPE_LANGUAGE_ONLY = 1; public static final int FORMAT_TYPE_FULL_LOCALE = 2; - public static final int FORMAT_TYPE_MULTIPLE = 3; private List<InputMethodSubtype> mEnabledSubtypes = Collections.emptyList(); private boolean mIsSystemLanguageSameAsInputLanguage; @@ -45,11 +43,7 @@ public final class LanguageOnSpacebarHelper { if (mEnabledSubtypes.size() < 2 && mIsSystemLanguageSameAsInputLanguage) { return FORMAT_TYPE_NONE; } - final Locale[] locales = subtype.getLocales(); - if (1 < locales.length) { - return FORMAT_TYPE_MULTIPLE; - } - final String keyboardLanguage = locales[0].getLanguage(); + final String keyboardLanguage = SubtypeLocaleUtils.getSubtypeLocale(subtype).getLanguage(); final String keyboardLayout = SubtypeLocaleUtils.getKeyboardLayoutSetName(subtype); int sameLanguageAndLayoutCount = 0; for (final InputMethodSubtype ims : mEnabledSubtypes) { |