Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c2aec3 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 

am: 29c01336

* commit '29c01336':
  Fix DatePicker.setMin/MaxDate()

Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
parents 30c63961 29c01336

core/java/android/widget/DatePickerCalendarDelegate.java

+4 −2
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    public void setMinDate(long minDate) {

        mTempDate.setTimeInMillis(minDate);

        if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMinDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMinDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        if (mCurrentDate.before(mTempDate)) {
@@ -453,7 +454,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    public void setMaxDate(long maxDate) {

        mTempDate.setTimeInMillis(maxDate);

        if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMaxDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMaxDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        if (mCurrentDate.after(mTempDate)) {

core/java/android/widget/DatePickerSpinnerDelegate.java

+4 −2
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    public void setMinDate(long minDate) {

        mTempDate.setTimeInMillis(minDate);

        if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMinDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMinDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        mMinDate.setTimeInMillis(minDate);
@@ -311,7 +312,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    public void setMaxDate(long maxDate) {

        mTempDate.setTimeInMillis(maxDate);

        if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMaxDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMaxDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        mMaxDate.setTimeInMillis(maxDate);