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

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

Browse Source
This commit is contained in:
Alan Viverette
2016-05-25 21:17:52 +00:00
committed by Android (Google) Code Review
parent 48b18f4fa9 3fb5c7b8fa
commit 29c01336db
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/DatePickerCalendarDelegate.java
View File

@@ -432,7 +432,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
public void setMinDate(long minDate) { public void setMinDate(long minDate) {
mTempDate.setTimeInMillis(minDate); mTempDate.setTimeInMillis(minDate);
if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR) 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; return;
} }
if (mCurrentDate.before(mTempDate)) { if (mCurrentDate.before(mTempDate)) {
@@ -453,7 +454,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
public void setMaxDate(long maxDate) { public void setMaxDate(long maxDate) {
mTempDate.setTimeInMillis(maxDate); mTempDate.setTimeInMillis(maxDate);
if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR) 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; return;
} }
if (mCurrentDate.after(mTempDate)) { if (mCurrentDate.after(mTempDate)) {

6
core/java/android/widget/DatePickerSpinnerDelegate.java
View File

@@ -288,7 +288,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate {
public void setMinDate(long minDate) { public void setMinDate(long minDate) {
mTempDate.setTimeInMillis(minDate); mTempDate.setTimeInMillis(minDate);
if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR) 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; return;
} }
mMinDate.setTimeInMillis(minDate); mMinDate.setTimeInMillis(minDate);
@@ -311,7 +312,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate {
public void setMaxDate(long maxDate) { public void setMaxDate(long maxDate) {
mTempDate.setTimeInMillis(maxDate); mTempDate.setTimeInMillis(maxDate);
if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR) 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; return;
} }
mMaxDate.setTimeInMillis(maxDate); mMaxDate.setTimeInMillis(maxDate);