diff options
| author | David Ogutu <ogutu@google.com> | 2018-03-21 10:40:43 -0400 |
|---|---|---|
| committer | David Ogutu <ogutu@google.com> | 2018-03-21 10:40:43 -0400 |
| commit | 2e654f764c94358381ebce7b4624cb734a099c6e (patch) | |
| tree | 628efcac0143a473d998f31a027bc8e452601bbd /core/java/android/widget/DayPickerPagerAdapter.java | |
| parent | 06cf154386429bc16d99991429279e305ee965d6 (diff) | |
Fix DatePicker highlight to be year-aware.
Before this change, a date would be highlighted for all years.
Test: manual https://drive.google.com/file/d/1X579-KokrMEO7p19A5xtamTs45VQaPAA/view?usp=sharing
Change-Id: I09bb7fa98eac61c4e160a133e421fb31ce57511d
Fixes: 74434011
Diffstat (limited to 'core/java/android/widget/DayPickerPagerAdapter.java')
| -rw-r--r-- | core/java/android/widget/DayPickerPagerAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/DayPickerPagerAdapter.java b/core/java/android/widget/DayPickerPagerAdapter.java index 63621e123320..57090a59d9a1 100644 --- a/core/java/android/widget/DayPickerPagerAdapter.java +++ b/core/java/android/widget/DayPickerPagerAdapter.java @@ -249,7 +249,8 @@ class DayPickerPagerAdapter extends PagerAdapter { final int year = getYearForPosition(position); final int selectedDay; - if (mSelectedDay != null && mSelectedDay.get(Calendar.MONTH) == month) { + if (mSelectedDay != null && mSelectedDay.get(Calendar.MONTH) == month && mSelectedDay.get( + Calendar.YEAR) == year) { selectedDay = mSelectedDay.get(Calendar.DAY_OF_MONTH); } else { selectedDay = -1; |