merge from open-source master (7243c042) · Commits · e / os / android_frameworks_base

core/java/android/widget/DatePicker.java

+17 −14

Original line number	Diff line number	Diff line
		@@ -94,9 +94,7 @@ public class DatePicker extends FrameLayout {
		mDayPicker.setOnChangeListener(new OnChangedListener() {
		public void onChanged(NumberPicker picker, int oldVal, int newVal) {
		mDay = newVal;
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		}
		});
		mMonthPicker = (NumberPicker) findViewById(R.id.month);
		@@ -114,9 +112,7 @@ public class DatePicker extends FrameLayout {
		mMonth = newVal - 1;
		// Adjust max day of the month
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		updateDaySpinner();
		}
		});
		@@ -127,9 +123,7 @@ public class DatePicker extends FrameLayout {
		mYear = newVal;
		// Adjust max day for leap years if needed
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		notifyDateChanged();
		updateDaySpinner();
		}
		});
		@@ -230,11 +224,14 @@ public class DatePicker extends FrameLayout {
		}

		public void updateDate(int year, int monthOfYear, int dayOfMonth) {
		if (mYear != year \|\| mMonth != monthOfYear \|\| mDay != dayOfMonth) {
		mYear = year;
		mMonth = monthOfYear;
		mDay = dayOfMonth;
		updateSpinners();
		reorderPickers(new DateFormatSymbols().getShortMonths());
		notifyDateChanged();
		}
		}

		private static class SavedState extends BaseSavedState {
		@@ -376,4 +373,10 @@ public class DatePicker extends FrameLayout {
		mDay = max;
		}
		}

		private void notifyDateChanged() {
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		}
		}