Refactor DatePickerDialog constructors to avoid early callback (a9a75f50) · Commits · e / os / android_frameworks_base

core/java/android/app/DatePickerDialog.java

+32 −25

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
	* @param context the parent context		* @param context the parent context
	*/		*/
	public DatePickerDialog(@NonNull Context context) {		public DatePickerDialog(@NonNull Context context) {
	this(context, 0);		this(context, 0, null, Calendar.getInstance(), -1, -1, -1);
	}		}

	/**		/**
	@@ -70,24 +70,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
	* {@code context}'s default alert dialog theme		* {@code context}'s default alert dialog theme
	*/		*/
	public DatePickerDialog(@NonNull Context context, @StyleRes int themeResId) {		public DatePickerDialog(@NonNull Context context, @StyleRes int themeResId) {
	super(context, resolveDialogTheme(context, themeResId));		this(context, themeResId, null, Calendar.getInstance(), -1, -1, -1);

	final Context themeContext = getContext();
	final LayoutInflater inflater = LayoutInflater.from(themeContext);
	final View view = inflater.inflate(R.layout.date_picker_dialog, null);
	setView(view);

	setButton(BUTTON_POSITIVE, themeContext.getString(R.string.ok), this);
	setButton(BUTTON_NEGATIVE, themeContext.getString(R.string.cancel), this);
	setButtonPanelLayoutHint(LAYOUT_HINT_SIDE);

	final Calendar calendar = Calendar.getInstance();
	final int year = calendar.get(Calendar.YEAR);
	final int monthOfYear = calendar.get(Calendar.MONTH);
	final int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
	mDatePicker = (DatePicker) view.findViewById(R.id.datePicker);
	mDatePicker.init(year, monthOfYear, dayOfMonth, this);
	mDatePicker.setValidationCallback(mValidationCallback);
	}		}

	/**		/**
	@@ -104,7 +87,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
	*/		*/
	public DatePickerDialog(@NonNull Context context, @Nullable OnDateSetListener listener,		public DatePickerDialog(@NonNull Context context, @Nullable OnDateSetListener listener,
	int year, int month, int dayOfMonth) {		int year, int month, int dayOfMonth) {
	this(context, 0, listener, year, month, dayOfMonth);		this(context, 0, listener, null, year, month, dayOfMonth);
	}		}

	/**		/**
	@@ -116,16 +99,40 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
	* {@code context}'s default alert dialog theme		* {@code context}'s default alert dialog theme
	* @param listener the listener to call when the user sets the date		* @param listener the listener to call when the user sets the date
	* @param year the initially selected year		* @param year the initially selected year
	* @param month the initially selected month (0-11 for compatibility with		* @param monthOfYear the initially selected month of the year (0-11 for
	* {@link Calendar#MONTH})		* compatibility with {@link Calendar#MONTH})
	* @param dayOfMonth the initially selected day of month (1-31, depending		* @param dayOfMonth the initially selected day of month (1-31, depending
	* on month)		* on month)
	*/		*/
	public DatePickerDialog(@NonNull Context context, @StyleRes int themeResId,		public DatePickerDialog(@NonNull Context context, @StyleRes int themeResId,
	@Nullable OnDateSetListener listener, int year, int month, int dayOfMonth) {		@Nullable OnDateSetListener listener, int year, int monthOfYear, int dayOfMonth) {
	this(context, themeResId);		this(context, themeResId, listener, null, year, monthOfYear, dayOfMonth);
			}

			private DatePickerDialog(@NonNull Context context, @StyleRes int themeResId,
			@Nullable OnDateSetListener listener, @Nullable Calendar calendar, int year,
			int monthOfYear, int dayOfMonth) {
			super(context, resolveDialogTheme(context, themeResId));

			final Context themeContext = getContext();
			final LayoutInflater inflater = LayoutInflater.from(themeContext);
			final View view = inflater.inflate(R.layout.date_picker_dialog, null);
			setView(view);

			setButton(BUTTON_POSITIVE, themeContext.getString(R.string.ok), this);
			setButton(BUTTON_NEGATIVE, themeContext.getString(R.string.cancel), this);
			setButtonPanelLayoutHint(LAYOUT_HINT_SIDE);

			if (calendar != null) {
			year = calendar.get(Calendar.YEAR);
			monthOfYear = calendar.get(Calendar.MONTH);
			dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
			}

			mDatePicker = (DatePicker) view.findViewById(R.id.datePicker);
			mDatePicker.init(year, monthOfYear, dayOfMonth, this);
			mDatePicker.setValidationCallback(mValidationCallback);

	mDatePicker.updateDate(year, month, dayOfMonth);
	mDateSetListener = listener;		mDateSetListener = listener;
	}		}

core/java/android/widget/DatePicker.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -75,8 +75,6 @@ import java.util.TimeZone;
	*/		*/
	@Widget		@Widget
	public class DatePicker extends FrameLayout {		public class DatePicker extends FrameLayout {
	private static final String LOG_TAG = DatePicker.class.getSimpleName();

	private static final int MODE_SPINNER = 1;		private static final int MODE_SPINNER = 1;
	private static final int MODE_CALENDAR = 2;		private static final int MODE_CALENDAR = 2;

core/java/android/widget/DatePickerCalendarDelegate.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -378,9 +378,9 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
	mCurrentDate.set(Calendar.MONTH, monthOfYear);		mCurrentDate.set(Calendar.MONTH, monthOfYear);
	mCurrentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);		mCurrentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);

	mDateChangedListener = callBack;

	onDateChanged(false, false);		onDateChanged(false, false);

			mDateChangedListener = callBack;
	}		}

	@Override		@Override

core/java/android/widget/DatePickerSpinnerDelegate.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -244,6 +244,7 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate {
	setDate(year, monthOfYear, dayOfMonth);		setDate(year, monthOfYear, dayOfMonth);
	updateSpinners();		updateSpinners();
	updateCalendarView();		updateCalendarView();

	mOnDateChangedListener = onDateChangedListener;		mOnDateChangedListener = onDateChangedListener;
	}		}