From 7f0c477a90229bdc1b4069876dcbff35eb34dc6d Mon Sep 17 00:00:00 2001 From: pubiqq Date: Mon, 20 Jan 2025 06:40:52 +0300 Subject: [PATCH] [Slider] Get default minTouchTargetSize from material attributes --- .../com/google/android/material/slider/BaseSlider.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/java/com/google/android/material/slider/BaseSlider.java b/lib/java/com/google/android/material/slider/BaseSlider.java index a06e67ff48a..aaaff2b6535 100644 --- a/lib/java/com/google/android/material/slider/BaseSlider.java +++ b/lib/java/com/google/android/material/slider/BaseSlider.java @@ -79,7 +79,6 @@ import androidx.annotation.ColorInt; import androidx.annotation.ColorRes; import androidx.annotation.DimenRes; -import androidx.annotation.Dimension; import androidx.annotation.DrawableRes; import androidx.annotation.IntDef; import androidx.annotation.IntRange; @@ -99,6 +98,7 @@ import com.google.android.material.internal.ViewOverlayImpl; import com.google.android.material.internal.ViewUtils; import com.google.android.material.motion.MotionUtils; +import com.google.android.material.resources.MaterialAttributes; import com.google.android.material.resources.MaterialResources; import com.google.android.material.shape.MaterialShapeDrawable; import com.google.android.material.shape.ShapeAppearanceModel; @@ -286,9 +286,6 @@ abstract class BaseSlider< private static final float RIGHT_LABEL_PIVOT_X = -0.2f; private static final float RIGHT_LABEL_PIVOT_Y = 0.5f; - @Dimension(unit = Dimension.DP) - private static final int MIN_TOUCH_TARGET_DP = 48; - @NonNull private final Paint inactiveTrackPaint; @NonNull private final Paint activeTrackPaint; @NonNull private final Paint thumbPaint; @@ -536,8 +533,7 @@ private void processAttributes(Context context, AttributeSet attrs, int defStyle setValues(valueFrom); stepSize = a.getFloat(R.styleable.Slider_android_stepSize, 0.0f); - float defaultMinTouchTargetSize = - (float) Math.ceil(ViewUtils.dpToPx(getContext(), MIN_TOUCH_TARGET_DP)); + float defaultMinTouchTargetSize = MaterialAttributes.resolveMinimumAccessibleTouchTarget(context); minTouchTargetSize = (int) Math.ceil(