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 am: 290fcdde7d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553791

Change-Id: I3782c20eed8cbc75c1d5b1eae8cc4715d8dc451d
This commit is contained in:
George Mount
2021-05-17 20:59:31 +00:00
committed by Automerger Merge Worker
parent 6d33045d1b 290fcdde7d
commit d85a7e41c8
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.