Skip to content

Commit f5f7f27

Browse files
committed
[Slider] Use the locale from the context for formatting
1 parent ede0713 commit f5f7f27

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/java/com/google/android/material/slider/BaseSlider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ abstract class BaseSlider<
303303
@NonNull private final Paint inactiveTicksPaint;
304304
@NonNull private final Paint activeTicksPaint;
305305
@NonNull private final Paint stopIndicatorPaint;
306+
@NonNull private final Locale locale;
306307
@NonNull private final AccessibilityHelper accessibilityHelper;
307308
private final AccessibilityManager accessibilityManager;
308309
private AccessibilityEventSender accessibilityEventSender;
@@ -463,6 +464,8 @@ public BaseSlider(
463464
// Initialize with just this view's visibility.
464465
thisAndAncestorsVisible = isShown();
465466

467+
locale = context.getResources().getConfiguration().locale;
468+
466469
inactiveTrackPaint = new Paint();
467470
activeTrackPaint = new Paint();
468471

@@ -3493,7 +3496,7 @@ private String formatValue(float value) {
34933496
return formatter.getFormattedValue(value);
34943497
}
34953498

3496-
return String.format((int) value == value ? "%.0f" : "%.2f", value);
3499+
return String.format(locale, (int) value == value ? "%.0f" : "%.2f", value);
34973500
}
34983501

34993502
private void setValueForLabel(TooltipDrawable label, float value) {
@@ -4093,7 +4096,7 @@ protected void onPopulateNodeForVirtualView(
40934096
verbalValueType = startOrEndDescription(virtualViewId);
40944097
}
40954098
contentDescription.append(
4096-
String.format(Locale.getDefault(), "%s, %s", verbalValueType, verbalValue));
4099+
String.format(slider.locale, "%s, %s", verbalValueType, verbalValue));
40974100
info.setContentDescription(contentDescription.toString());
40984101

40994102
slider.updateBoundsForVirtualViewId(virtualViewId, virtualViewBounds);

0 commit comments

Comments
 (0)