Skip to content

Commit d3f327b

Browse files
chethaaseAndroid (Google) Code Review
authored andcommitted
Merge "Localize SimpleMonthView" into mnc-dev
2 parents 2594530 + 1ea4715 commit d3f327b

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

core/java/android/widget/SimpleMonthView.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import com.android.internal.R;
4343
import com.android.internal.widget.ExploreByTouchHelper;
4444

45+
import java.text.NumberFormat;
4546
import java.text.SimpleDateFormat;
4647
import java.util.Calendar;
4748
import java.util.Locale;
@@ -73,6 +74,7 @@ class SimpleMonthView extends View {
7374

7475
private final SimpleDateFormat mTitleFormatter;
7576
private final SimpleDateFormat mDayOfWeekFormatter;
77+
private final NumberFormat mDayFormatter;
7678

7779
// Desired dimensions.
7880
private final int mDesiredMonthHeight;
@@ -162,6 +164,7 @@ public SimpleMonthView(Context context, AttributeSet attrs, int defStyleAttr, in
162164
final String titleFormat = DateFormat.getBestDateTimePattern(locale, DEFAULT_TITLE_FORMAT);
163165
mTitleFormatter = new SimpleDateFormat(titleFormat, locale);
164166
mDayOfWeekFormatter = new SimpleDateFormat(DAY_OF_WEEK_FORMAT, locale);
167+
mDayFormatter = NumberFormat.getIntegerInstance(locale);
165168

166169
initPaints(res);
167170
}
@@ -454,7 +457,7 @@ private void drawDays(Canvas canvas) {
454457
}
455458
p.setColor(dayTextColor);
456459

457-
canvas.drawText(Integer.toString(day), colCenterRtl, rowCenter - halfLineHeight, p);
460+
canvas.drawText(mDayFormatter.format(day), colCenterRtl, rowCenter - halfLineHeight, p);
458461

459462
col++;
460463

@@ -866,7 +869,7 @@ private CharSequence getDayDescription(int id) {
866869
*/
867870
private CharSequence getDayText(int id) {
868871
if (isValidDayOfMonth(id)) {
869-
return Integer.toString(id);
872+
return mDayFormatter.format(id);
870873
}
871874

872875
return null;

0 commit comments

Comments
 (0)