Merge "Fix empty custom input style entry appears after orientation change" into jb-dev (b4b3e80f) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {

		private interface SubtypeDialogProxy {
		public void onRemovePressed(SubtypePreference subtypePref);
		public void onAddPressed(SubtypePreference subtypePref);
		public SubtypeLocaleAdapter getSubtypeLocaleAdapter();
		public KeyboardLayoutSetAdapter getKeyboardLayoutSetAdapter();
		}
		@@ -241,6 +242,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		super.onClick(dialog, which);
		switch (which) {
		case DialogInterface.BUTTON_POSITIVE:
		final boolean addPressed = isIncomplete();
		final SubtypeLocaleItem locale =
		(SubtypeLocaleItem) mSubtypeLocaleSpinner.getSelectedItem();
		final KeyboardLayoutSetItem layout =
		@@ -249,6 +251,9 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		locale.first, layout.first, ASCII_CAPABLE);
		setSubtype(subtype);
		notifyChanged();
		if (addPressed) {
		mProxy.onAddPressed(this);
		}
		break;
		case DialogInterface.BUTTON_NEUTRAL:
		// Nothing to do
		@@ -390,6 +395,11 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		}
		}

		@Override
		public void onAddPressed(SubtypePreference subtypePref) {
		mIsAddingNewSubtype = false;
		}

		@Override
		public SubtypeLocaleAdapter getSubtypeLocaleAdapter() {
		return mSubtypeLocaleAdapter;