Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I66d3db4c9ed3f54ce17a8d64ca0c6cce6941cdaa
This commit is contained in:
The Android Open Source Project
2010-03-08 17:14:25 -08:00
parent f1f90d4aba e3491b6b5f
commit 9161e202d1
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/widget/DatePicker.java
View File

@@ -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);
@@ -126,9 +124,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();
}
});
@@ -139,9 +135,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();
}
});
@@ -242,11 +236,14 @@ public class DatePicker extends FrameLayout {
}
public void updateDate(int year, int monthOfYear, int dayOfMonth) {
mYear = year;
mMonth = monthOfYear;
mDay = dayOfMonth;
updateSpinners();
reorderPickers(new DateFormatSymbols().getShortMonths());
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 {
@@ -388,4 +385,10 @@ public class DatePicker extends FrameLayout {
mDay = max;
}
}
private void notifyDateChanged() {
if (mOnDateChangedListener != null) {
mOnDateChangedListener.onDateChanged(DatePicker.this, mYear, mMonth, mDay);
}
}
}