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

Merge "CalendarView header not updated on year change." into jb-mr2-dev

Browse Source
This commit is contained in:
Svetoslav
2013-05-30 19:48:59 +00:00
committed by Android (Google) Code Review
parent 054255c6d2 a085179558
commit ec58699413
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/widget/CalendarView.java
View File

@@ -1248,17 +1248,14 @@ public class CalendarView extends FrameLayout {
* @param calendar A day in the new focus month.
*/
private void setMonthDisplayed(Calendar calendar) {
final int newMonthDisplayed = calendar.get(Calendar.MONTH);
if (mCurrentMonthDisplayed != newMonthDisplayed) {
mCurrentMonthDisplayed = newMonthDisplayed;
mAdapter.setFocusMonth(mCurrentMonthDisplayed);
final int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_MONTH_DAY
| DateUtils.FORMAT_SHOW_YEAR;
final long millis = calendar.getTimeInMillis();
String newMonthName = DateUtils.formatDateRange(mContext, millis, millis, flags);
mMonthName.setText(newMonthName);
mMonthName.invalidate();
}
mCurrentMonthDisplayed = calendar.get(Calendar.MONTH);
mAdapter.setFocusMonth(mCurrentMonthDisplayed);
final int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_MONTH_DAY
| DateUtils.FORMAT_SHOW_YEAR;
final long millis = calendar.getTimeInMillis();
String newMonthName = DateUtils.formatDateRange(mContext, millis, millis, flags);
mMonthName.setText(newMonthName);
mMonthName.invalidate();
}
/**