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

am 1ac88088: Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev

Browse Source 
* commit '1ac88088adf54be60c12ec80c3533ee586eee02f':
  Return correct year in DayPickerPagerAdapter.getYearForPosition()
This commit is contained in:
Alan Viverette
2015-05-15 22:33:40 +00:00
committed by Android Git Automerger
parent f0d40256b8 1ac88088ad
commit b50a8b97da
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/DayPickerPagerAdapter.java
View File

@@ -186,11 +186,12 @@ class DayPickerPagerAdapter extends PagerAdapter {
}
private int getMonthForPosition(int position) {
return position % MONTHS_IN_YEAR + mMinDate.get(Calendar.MONTH);
return (position + mMinDate.get(Calendar.MONTH)) % MONTHS_IN_YEAR;
}
private int getYearForPosition(int position) {
return position / MONTHS_IN_YEAR + mMinDate.get(Calendar.YEAR);
final int yearOffset = (position + mMinDate.get(Calendar.MONTH)) / MONTHS_IN_YEAR;
return yearOffset + mMinDate.get(Calendar.YEAR);
}
private int getPositionForDay(@Nullable Calendar day) {
@@ -198,8 +199,8 @@ class DayPickerPagerAdapter extends PagerAdapter {
return -1;
}
final int yearOffset = (day.get(Calendar.YEAR) - mMinDate.get(Calendar.YEAR));
final int monthOffset = (day.get(Calendar.MONTH) - mMinDate.get(Calendar.MONTH));
final int yearOffset = day.get(Calendar.YEAR) - mMinDate.get(Calendar.YEAR);
final int monthOffset = day.get(Calendar.MONTH) - mMinDate.get(Calendar.MONTH);
final int position = yearOffset * MONTHS_IN_YEAR + monthOffset;
return position;
}

4
core/java/android/widget/DayPickerView.java
View File

@@ -176,8 +176,6 @@ class DayPickerView extends ViewGroup {
}
}
});
updateButtonVisibility(mViewPager.getCurrentItem());
}
private void updateButtonVisibility(int position) {
@@ -346,6 +344,8 @@ class DayPickerView extends ViewGroup {
// Changing the min/max date changes the selection position since we
// don't really have stable IDs. Jumps immediately to the new position.
setDate(mSelectedDay.getTimeInMillis(), false, false);
updateButtonVisibility(mViewPager.getCurrentItem());
}
/**