Skip to content

Commit 13af4a0

Browse files
committed
[Slider] Use the locale from the context for formatting
^ Conflicts: ^ lib/java/com/google/android/material/slider/BaseSlider.java
1 parent 56a96a8 commit 13af4a0

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
@@ -304,6 +304,7 @@ abstract class BaseSlider<
304304
@NonNull private final Paint inactiveTicksPaint;
305305
@NonNull private final Paint activeTicksPaint;
306306
@NonNull private final Paint stopIndicatorPaint;
307+
@NonNull private final Locale locale;
307308
@NonNull private final AccessibilityHelper accessibilityHelper;
308309
private final AccessibilityManager accessibilityManager;
309310
private AccessibilityEventSender accessibilityEventSender;
@@ -465,6 +466,8 @@ public BaseSlider(
465466
// Initialize with just this view's visibility.
466467
thisAndAncestorsVisible = isShown();
467468

469+
locale = context.getResources().getConfiguration().locale;
470+
468471
inactiveTrackPaint = new Paint();
469472
activeTrackPaint = new Paint();
470473

@@ -3547,7 +3550,7 @@ private String formatValue(float value) {
35473550
return formatter.getFormattedValue(value);
35483551
}
35493552

3550-
return String.format((int) value == value ? "%.0f" : "%.2f", value);
3553+
return String.format(locale, (int) value == value ? "%.0f" : "%.2f", value);
35513554
}
35523555

35533556
private void setValueForLabel(TooltipDrawable label, float value) {
@@ -4155,7 +4158,7 @@ protected void onPopulateNodeForVirtualView(
41554158
info.setStateDescription(stateDescription);
41564159
} else {
41574160
contentDescription.append(
4158-
String.format(Locale.getDefault(), "%s, %s", verbalValueType, verbalValue));
4161+
String.format(slider.locale, "%s, %s", verbalValueType, verbalValue));
41594162
}
41604163
info.setContentDescription(contentDescription.toString());
41614164

0 commit comments

Comments
 (0)