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

Commit 93692c36 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog" 

* commit '53309365':
  use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
parents 8749f35f 53309365

src/com/android/settings/DateTimeSettings.java

+9 −0
Original line number Diff line number Diff line
@@ -244,6 +244,15 @@ public class DateTimeSettings extends SettingsPreferenceFragment 
                calendar.get(Calendar.YEAR),

                calendar.get(Calendar.MONTH),

                calendar.get(Calendar.DAY_OF_MONTH));

            // The system clock can't represent dates outside this range.

            DatePickerDialog datePicker = (DatePickerDialog)d;

            Calendar t = Calendar.getInstance();

            t.clear();

            t.set(1970, Calendar.JANUARY, 1);

            datePicker.getDatePicker().setMinDate(t.getTimeInMillis());

            t.clear();

            t.set(2037, Calendar.DECEMBER, 31);

            datePicker.getDatePicker().setMaxDate(t.getTimeInMillis());

            break;

        }

        case DIALOG_TIMEPICKER: {