nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix using keyboard layout display name in custom input style spinner 

Change-Id: I80626591574aa9995011202cf868f9c2c5168303
main
Tadashi G. Takaoka 2012-04-23 12:03:47 +09:00
parent 1894c6e586
commit a245be6819
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java
View File

@ -109,18 +109,15 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
} }
static class KeyboardLayoutSetItem extends Pair<String, String> { static class KeyboardLayoutSetItem extends Pair<String, String> {
public KeyboardLayoutSetItem(String keyboardLayoutSetName) { public KeyboardLayoutSetItem(InputMethodSubtype subtype) {
super(keyboardLayoutSetName, getDisplayName(keyboardLayoutSetName)); super(SubtypeLocale.getKeyboardLayoutSetName(subtype),
SubtypeLocale.getKeyboardLayoutSetDisplayName(subtype));
} }
@Override @Override
public String toString() { public String toString() {
return second; return second;
} }
private static String getDisplayName(String keyboardLayoutSetName) {
return keyboardLayoutSetName.toUpperCase();
}
} }
static class KeyboardLayoutSetAdapter extends ArrayAdapter<KeyboardLayoutSetItem> { static class KeyboardLayoutSetAdapter extends ArrayAdapter<KeyboardLayoutSetItem> {
@ -130,7 +127,10 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
// TODO: Should filter out already existing combinations of locale and layout. // TODO: Should filter out already existing combinations of locale and layout.
for (final String layout : SubtypeLocale.getPredefinedKeyboardLayoutSet()) { for (final String layout : SubtypeLocale.getPredefinedKeyboardLayoutSet()) {
add(new KeyboardLayoutSetItem(layout)); // This is a dummy subtype with NO_LANGUAGE, only for display.
final InputMethodSubtype subtype = AdditionalSubtype.createAdditionalSubtype(
SubtypeLocale.NO_LANGUAGE, layout, null);
add(new KeyboardLayoutSetItem(subtype));
} }
} }
} }
@ -196,8 +196,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
.setNegativeButton(R.string.remove, this); .setNegativeButton(R.string.remove, this);
final SubtypeLocaleItem localeItem = SubtypeLocaleAdapter.createItem( final SubtypeLocaleItem localeItem = SubtypeLocaleAdapter.createItem(
context, mSubtype.getLocale()); context, mSubtype.getLocale());
final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem( final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem(mSubtype);
SubtypeLocale.getKeyboardLayoutSetName(mSubtype));
setSpinnerPosition(mSubtypeLocaleSpinner, localeItem); setSpinnerPosition(mSubtypeLocaleSpinner, localeItem);
setSpinnerPosition(mKeyboardLayoutSetSpinner, layoutItem); setSpinnerPosition(mKeyboardLayoutSetSpinner, layoutItem);
} }