Merge "Allow creating custom dialogs in DialogPreference." into cm-10.1 (8e456b52) · Commits · e / os / android_frameworks_base

core/java/android/preference/DialogPreference.java

+21 −14

Original line number	Diff line number	Diff line
		@@ -274,6 +274,22 @@ public abstract class DialogPreference extends Preference implements
		* @param state Optional instance state to restore on the dialog
		*/
		protected void showDialog(Bundle state) {
		// Create the dialog
		final Dialog dialog = mDialog = createDialog();
		if (state != null) {
		dialog.onRestoreInstanceState(state);
		}
		if (needInputMethod()) {
		requestInputMethod(dialog);
		}
		dialog.setOnDismissListener(this);
		dialog.show();
		}

		/**
		* @hide
		*/
		protected Dialog createDialog() {
		Context context = getContext();

		mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE;
		@@ -296,16 +312,7 @@ public abstract class DialogPreference extends Preference implements

		getPreferenceManager().registerOnActivityDestroyListener(this);

		// Create the dialog
		final Dialog dialog = mDialog = mBuilder.create();
		if (state != null) {
		dialog.onRestoreInstanceState(state);
		}
		if (needInputMethod()) {
		requestInputMethod(dialog);
		}
		dialog.setOnDismissListener(this);
		dialog.show();
		return mBuilder.create();
		}

		/**