Skip to content

Commit 7f0c477

Browse files
committed
[Slider] Get default minTouchTargetSize from material attributes
1 parent 690bbfc commit 7f0c477

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import androidx.annotation.ColorInt;
8080
import androidx.annotation.ColorRes;
8181
import androidx.annotation.DimenRes;
82-
import androidx.annotation.Dimension;
8382
import androidx.annotation.DrawableRes;
8483
import androidx.annotation.IntDef;
8584
import androidx.annotation.IntRange;
@@ -99,6 +98,7 @@
9998
import com.google.android.material.internal.ViewOverlayImpl;
10099
import com.google.android.material.internal.ViewUtils;
101100
import com.google.android.material.motion.MotionUtils;
101+
import com.google.android.material.resources.MaterialAttributes;
102102
import com.google.android.material.resources.MaterialResources;
103103
import com.google.android.material.shape.MaterialShapeDrawable;
104104
import com.google.android.material.shape.ShapeAppearanceModel;
@@ -286,9 +286,6 @@ abstract class BaseSlider<
286286
private static final float RIGHT_LABEL_PIVOT_X = -0.2f;
287287
private static final float RIGHT_LABEL_PIVOT_Y = 0.5f;
288288

289-
@Dimension(unit = Dimension.DP)
290-
private static final int MIN_TOUCH_TARGET_DP = 48;
291-
292289
@NonNull private final Paint inactiveTrackPaint;
293290
@NonNull private final Paint activeTrackPaint;
294291
@NonNull private final Paint thumbPaint;
@@ -536,8 +533,7 @@ private void processAttributes(Context context, AttributeSet attrs, int defStyle
536533
setValues(valueFrom);
537534
stepSize = a.getFloat(R.styleable.Slider_android_stepSize, 0.0f);
538535

539-
float defaultMinTouchTargetSize =
540-
(float) Math.ceil(ViewUtils.dpToPx(getContext(), MIN_TOUCH_TARGET_DP));
536+
float defaultMinTouchTargetSize = MaterialAttributes.resolveMinimumAccessibleTouchTarget(context);
541537
minTouchTargetSize =
542538
(int)
543539
Math.ceil(

0 commit comments

Comments
 (0)