Cancel SubtypePreference dialog properly (cbaf6d85) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,8 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		public KeyboardLayoutSetAdapter getKeyboardLayoutSetAdapter();
		}

		static class SubtypePreference extends DialogPreference {
		static class SubtypePreference extends DialogPreference
		implements DialogInterface.OnCancelListener {
		private static final String KEY_PREFIX = "subtype_pref_";
		private static final String KEY_NEW_SUBTYPE = KEY_PREFIX + "new";

		@@ -205,6 +206,7 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		@Override
		protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
		final Context context = builder.getContext();
		builder.setCancelable(true).setOnCancelListener(this);
		if (isIncomplete()) {
		builder.setPositiveButton(R.string.add, this)
		.setNegativeButton(android.R.string.cancel, this);
		@@ -232,6 +234,13 @@ public class AdditionalSubtypeSettings extends PreferenceFragment {
		}
		}

		@Override
		public void onCancel(DialogInterface dialog) {
		if (isIncomplete()) {
		mProxy.onRemovePressed(this);
		}
		}

		@Override
		public void onClick(DialogInterface dialog, int which) {
		super.onClick(dialog, which);