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

2021-05-17 20:50:56 +00:00
parent 557e16ba64 4f2b9ad2bd
commit 290fcdde7d
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/core/java/android/widget/DatePickerCalendarDelegate.java
@@ -259,6 +259,11 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
            }

            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);

            // Automatically switch to day picker.