am fa8904a6: Merge change 7012 into donut (47646051) · Commits · e / os / android_frameworks_base

core/java/android/widget/DatePicker.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@ public class DatePicker extends FrameLayout {
		* subtract by one to ensure our internal state is always 0-11
		*/
		mMonth = newVal - 1;
		// Adjust max day of the month
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		@@ -121,9 +123,12 @@ public class DatePicker extends FrameLayout {
		mYearPicker.setOnChangeListener(new OnChangedListener() {
		public void onChanged(NumberPicker picker, int oldVal, int newVal) {
		mYear = newVal;
		// Adjust max day for leap years if needed
		adjustMaxDay();
		if (mOnDateChangedListener != null) {
		mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
		}
		updateDaySpinner();
		}
		});

		@@ -318,4 +323,14 @@ public class DatePicker extends FrameLayout {
		public int getDayOfMonth() {
		return mDay;
		}

		private void adjustMaxDay(){
		Calendar cal = Calendar.getInstance();
		cal.set(Calendar.YEAR, mYear);
		cal.set(Calendar.MONTH, mMonth);
		int max = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
		if (mDay > max) {
		mDay = max;
		}
		}
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -243,10 +243,12 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
		private void validateCurrentView(CharSequence str) {
		int val = getSelectedPos(str.toString());
		if ((val >= mStart) && (val <= mEnd)) {
		if (mCurrent != val) {
		mPrevious = mCurrent;
		mCurrent = val;
		notifyChange();
		}
		}
		updateView();
		}