summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/DatePicker.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index 821e1f65daec..fce24496d2fc 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -514,10 +514,11 @@ public class DatePicker extends FrameLayout {
* inconsistent date the values are normalized before updating the spinners.
*/
private void updateSpinners(int year, int month, int dayOfMonth) {
- mCurrentDate.set(Calendar.YEAR, year);
+ // compute the deltas before modifying the current date
int deltaMonths = getDelataMonth(month);
- mCurrentDate.add(Calendar.MONTH, deltaMonths);
int deltaDays = getDelataDayOfMonth(dayOfMonth);
+ mCurrentDate.set(Calendar.YEAR, year);
+ mCurrentDate.add(Calendar.MONTH, deltaMonths);
mCurrentDate.add(Calendar.DAY_OF_MONTH, deltaDays);
if (mCurrentDate.before(mMinDate)) {