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

Merge "Fixes minimum date in DatePicker" into sc-dev

Browse Source
This commit is contained in:
George Mount
2021-05-17 20:50:56 +00:00
committed by Android (Google) Code Review
parent 557e16ba64 4f2b9ad2bd
commit 290fcdde7d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,6 +259,11 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
} }
mCurrentDate.set(Calendar.YEAR, year); mCurrentDate.set(Calendar.YEAR, year);
if (mCurrentDate.compareTo(mMinDate) < 0) {
mCurrentDate.setTimeInMillis(mMinDate.getTimeInMillis());
} else if (mCurrentDate.compareTo(mMaxDate) > 0) {
mCurrentDate.setTimeInMillis(mMaxDate.getTimeInMillis());
}
onDateChanged(true, true); onDateChanged(true, true);
// Automatically switch to day picker. // Automatically switch to day picker.