Merge "Fix using keyboard layout display name in custom input style spinner" (e060d1a5) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -109,18 +109,15 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		}

		static class KeyboardLayoutSetItem extends Pair<String, String> {
		public KeyboardLayoutSetItem(String keyboardLayoutSetName) {
		super(keyboardLayoutSetName, getDisplayName(keyboardLayoutSetName));
		public KeyboardLayoutSetItem(InputMethodSubtype subtype) {
		super(SubtypeLocale.getKeyboardLayoutSetName(subtype),
		SubtypeLocale.getKeyboardLayoutSetDisplayName(subtype));
		}

		@Override
		public String toString() {
		return second;
		}

		private static String getDisplayName(String keyboardLayoutSetName) {
		return keyboardLayoutSetName.toUpperCase();
		}
		}

		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.
		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);
		final SubtypeLocaleItem localeItem = SubtypeLocaleAdapter.createItem(
		context, mSubtype.getLocale());
		final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem(
		SubtypeLocale.getKeyboardLayoutSetName(mSubtype));
		final KeyboardLayoutSetItem layoutItem = new KeyboardLayoutSetItem(mSubtype);
		setSpinnerPosition(mSubtypeLocaleSpinner, localeItem);
		setSpinnerPosition(mKeyboardLayoutSetSpinner, layoutItem);
		}