diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-13 00:44:51 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 00:44:51 +0000 |
| commit | 2103f795fab02774be20491820177eb60ec85800 (patch) | |
| tree | 488c9e3fe46de34da25d8d5def9be227a3766d30 /java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java | |
| parent | de2f4d3eca459ba60bb3a3b723d3c3f9d104f9d1 (diff) | |
| parent | 8b46c595dc54f3f858116428855592bc8b67018a (diff) | |
| download | latinime-2103f795fab02774be20491820177eb60ec85800.tar.gz latinime-2103f795fab02774be20491820177eb60ec85800.tar.xz latinime-2103f795fab02774be20491820177eb60ec85800.zip | |
am 8b46c595: Merge "Clean SubtypeLocaleUtils a bit"
* commit '8b46c595dc54f3f858116428855592bc8b67018a':
Clean SubtypeLocaleUtils a bit
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java b/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java index 01398f467..b749aa51a 100644 --- a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java +++ b/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java @@ -346,8 +346,10 @@ final class CustomInputStylePreference extends DialogPreference super(context, android.R.layout.simple_spinner_item); setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + final String[] predefinedKeyboardLayoutSet = context.getResources().getStringArray( + R.array.predefined_layouts); // TODO: Should filter out already existing combinations of locale and layout. - for (final String layout : SubtypeLocaleUtils.getPredefinedKeyboardLayoutSet()) { + for (final String layout : predefinedKeyboardLayoutSet) { // This is a dummy subtype with NO_LANGUAGE, only for display. final InputMethodSubtype subtype = AdditionalSubtypeUtils.createDummyAdditionalSubtype( |