Merge "Use other numerals when necessary." into jb-mr2-dev
diff --git a/src/com/android/datetimepicker/date/SimpleMonthView.java b/src/com/android/datetimepicker/date/SimpleMonthView.java
index f4120d8..f2a90d7 100644
--- a/src/com/android/datetimepicker/date/SimpleMonthView.java
+++ b/src/com/android/datetimepicker/date/SimpleMonthView.java
@@ -339,7 +339,7 @@
sbuf.append(mCalendar.getDisplayName(Calendar.MONTH, Calendar.LONG,
Locale.getDefault()));
sbuf.append(" ");
- sbuf.append(mYear);
+ sbuf.append(String.format("%d", mYear));
canvas.drawText(sbuf.toString(), x, y, mMonthTitlePaint);
}
@@ -380,7 +380,7 @@
} else {
mMonthNumPaint.setColor(mDayTextColor);
}
- canvas.drawText(Integer.valueOf(dayNumber).toString(), x, y, mMonthNumPaint);
+ canvas.drawText(String.format("%d", dayNumber), x, y, mMonthNumPaint);
j++;
if (j == mNumDays) {
diff --git a/src/com/android/datetimepicker/date/YearPickerView.java b/src/com/android/datetimepicker/date/YearPickerView.java
index e5fec5e..465b759 100644
--- a/src/com/android/datetimepicker/date/YearPickerView.java
+++ b/src/com/android/datetimepicker/date/YearPickerView.java
@@ -69,7 +69,7 @@
private void init(Context context) {
ArrayList<String> years = new ArrayList<String>();
for (int year = mController.getMinYear(); year <= mController.getMaxYear(); year++) {
- years.add(Integer.valueOf(year).toString());
+ years.add(String.format("%d", year));
}
mAdapter = new YearAdapter(context, R.layout.year_label_text_view, years);
setAdapter(mAdapter);