Skip to content

Commit 92bc02c

Browse files
paulfthomashunterstich
authored andcommitted
[NTC][Slider] Make tick size defaults to the stop indicator size if set
PiperOrigin-RevId: 617609939 (cherry picked from commit f3a93d0)
1 parent 387f59b commit 92bc02c

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

docs/components/Slider.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ slider also has tick marks.
311311
`app:trackColorInative`. It's a shorthand for setting both values to the same
312312
thing.
313313

314+
**Note:** `app:trackStopIndicatorSize` takes precedence over
315+
`app:tickRadiusActive` and `app:tickRadiusInactive`.
316+
314317
#### Thumb attributes
315318

316319
| Element | Attribute | Related method(s) | Default value |
@@ -346,8 +349,8 @@ Element | Attribute | Related method(s)
346349
| **Color** | `app:tickColor` | `setTickTintList`<br/>`getTickTintList` | `null` |
347350
| **Color for tick's active part** | `app:tickColorActive` | `setTickActiveTintList`<br/>`getTickActiveTintList` | `?attr/colorSurfaceContainerHighest` |
348351
| **Color for tick's inactive part** | `app:tickColorInactive` | `setTickInactiveTintList`<br/>`getTickInactiveTintList` | `?attr/colorPrimary` |
349-
| **Radius for tick's active part** | `app:tickRadiusActive` | `setTickActiveRadius`<br/>`getTickActiveRadius` | `1dp` |
350-
| **Radius for tick's inactive part** | `app:tickRadiusInactive` | `setTickInactiveRadius`<br/>`getTickInactiveRadius` | `1dp` |
352+
| **Radius for tick's active part** | `app:tickRadiusActive` | `setTickActiveRadius`<br/>`getTickActiveRadius` | `null` (1/2 trackStopIndicatorSize) |
353+
| **Radius for tick's inactive part** | `app:tickRadiusInactive` | `setTickInactiveRadius`<br/>`getTickInactiveRadius` | `null` (1/2 trackStopIndicatorSize) |
351354
| **Tick visible** | `app:tickVisible` | `setTickVisible`<br/>`isTickVisible()` | `true` |
352355

353356
**Note:** `app:tickColor` takes precedence over `app:tickColorActive` and

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,10 @@ private void processAttributes(Context context, AttributeSet attrs, int defStyle
538538

539539
setTrackHeight(a.getDimensionPixelSize(R.styleable.Slider_trackHeight, 0));
540540

541-
setTickActiveRadius(a.getDimensionPixelSize(R.styleable.Slider_tickRadiusActive, 0));
542-
543-
setTickInactiveRadius(a.getDimensionPixelSize(R.styleable.Slider_tickRadiusInactive, 0));
541+
setTickActiveRadius(
542+
a.getDimensionPixelSize(R.styleable.Slider_tickRadiusActive, trackStopIndicatorSize / 2));
543+
setTickInactiveRadius(
544+
a.getDimensionPixelSize(R.styleable.Slider_tickRadiusInactive, trackStopIndicatorSize / 2));
544545

545546
setLabelBehavior(a.getInt(R.styleable.Slider_labelBehavior, LABEL_FLOATING));
546547

lib/java/com/google/android/material/slider/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
<item name="thumbColor">@color/m3_slider_thumb_color</item>
6464
<item name="tickColorActive">@color/m3_slider_inactive_track_color</item>
6565
<item name="tickColorInactive">@color/m3_slider_active_track_color</item>
66+
<item name="tickRadiusActive">@null</item>
67+
<item name="tickRadiusInactive">@null</item>
6668
<item name="trackColorActive">@color/m3_slider_active_track_color</item>
6769
<item name="trackColorInactive">@color/m3_slider_inactive_track_color</item>
6870
<item name="trackHeight">@dimen/m3_comp_slider_inactive_track_height</item>

0 commit comments

Comments
 (0)