Skip to content

Commit 35a8203

Browse files
committed
[Slider] a11y fixes
Resolves #2176 PiperOrigin-RevId: 702789538
1 parent c1c19c8 commit 35a8203

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3783,7 +3783,7 @@ void updateBoundsForVirtualViewId(int virtualViewId, Rect virtualViewBounds) {
37833783
virtualViewBounds.set((int) rect.left, (int) rect.top, (int) rect.right, (int) rect.bottom);
37843784
}
37853785

3786-
private static class AccessibilityHelper extends ExploreByTouchHelper {
3786+
public static class AccessibilityHelper extends ExploreByTouchHelper {
37873787

37883788
private final BaseSlider<?, ?, ?> slider;
37893789
final Rect virtualViewBounds = new Rect();
@@ -3806,15 +3806,15 @@ protected int getVirtualViewAt(float x, float y) {
38063806
}
38073807

38083808
@Override
3809-
protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
3809+
protected void getVisibleVirtualViews(@NonNull List<Integer> virtualViewIds) {
38103810
for (int i = 0; i < slider.getValues().size(); i++) {
38113811
virtualViewIds.add(i);
38123812
}
38133813
}
38143814

38153815
@Override
38163816
protected void onPopulateNodeForVirtualView(
3817-
int virtualViewId, AccessibilityNodeInfoCompat info) {
3817+
int virtualViewId, @NonNull AccessibilityNodeInfoCompat info) {
38183818

38193819
info.addAction(AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS);
38203820

@@ -3855,7 +3855,8 @@ protected void onPopulateNodeForVirtualView(
38553855
if (values.size() > 1) {
38563856
verbalValueType = startOrEndDescription(virtualViewId);
38573857
}
3858-
contentDescription.append(String.format(Locale.US, "%s, %s", verbalValueType, verbalValue));
3858+
contentDescription.append(
3859+
String.format(Locale.getDefault(), "%s, %s", verbalValueType, verbalValue));
38593860
info.setContentDescription(contentDescription.toString());
38603861

38613862
slider.updateBoundsForVirtualViewId(virtualViewId, virtualViewBounds);
@@ -3878,7 +3879,7 @@ private String startOrEndDescription(int virtualViewId) {
38783879

38793880
@Override
38803881
protected boolean onPerformActionForVirtualView(
3881-
int virtualViewId, int action, Bundle arguments) {
3882+
int virtualViewId, int action, @Nullable Bundle arguments) {
38823883
if (!slider.isEnabled()) {
38833884
return false;
38843885
}

0 commit comments

Comments
 (0)