[Slider] Fix the handle width when touched in a scrolling container a…

…nd when more than one handle is in the touch position. Resolves #4151 Resolves #4149 Resolves #4150 GIT_ORIGIN_REV_ID=d78e6e24416135fa1a21dc6e298902ab6b893490 PiperOrigin-RevId: 635894036
material-components · May 23, 2024 · d85b73f · d85b73f
1 parent 8edae9b
commit d85b73f
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/lib/java/com/google/android/material/slider/BaseSlider.java b/lib/java/com/google/android/material/slider/BaseSlider.java
@@ -2357,19 +2357,12 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
 
         requestFocus();
         thumbIsPressed = true;
+        updateThumbWidthWhenPressed();
+        onStartTrackingTouch();
+
         snapTouchPosition();
         updateHaloHotspot();
-        // Update the thumb width when pressed.
-        if (hasGapBetweenThumbAndTrack()) {
-          defaultThumbWidth = thumbWidth;
-          defaultThumbTrackGapSize = thumbTrackGapSize;
-          int pressedThumbWidth = Math.round(thumbWidth * THUMB_WIDTH_PRESSED_RATIO);
-          int delta = thumbWidth - pressedThumbWidth;
-          setThumbWidth(pressedThumbWidth);
-          setThumbTrackGapSize(thumbTrackGapSize - delta / 2);
-        }
         invalidate();
-        onStartTrackingTouch();
         break;
       case MotionEvent.ACTION_MOVE:
         if (!thumbIsPressed) {
@@ -2378,15 +2371,17 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
             return false;
           }
           getParent().requestDisallowInterceptTouchEvent(true);
-          onStartTrackingTouch();
-        }
 
-        if (!pickActiveThumb()) {
-          // Couldn't determine the active thumb yet.
-          break;
+          if (!pickActiveThumb()) {
+            // Couldn't determine the active thumb yet.
+            break;
+          }
+
+          thumbIsPressed = true;
+          updateThumbWidthWhenPressed();
+          onStartTrackingTouch();
         }
 
-        thumbIsPressed = true;
         snapTouchPosition();
         updateHaloHotspot();
         invalidate();
@@ -2430,6 +2425,18 @@ && abs(lastEvent.getY() - event.getY()) <= scaledTouchSlop) {
     return true;
   }
 
+  private void updateThumbWidthWhenPressed() {
+    // Update thumb width and track gap size when pressed.
+    if (hasGapBetweenThumbAndTrack()) {
+      defaultThumbWidth = thumbWidth;
+      defaultThumbTrackGapSize = thumbTrackGapSize;
+      int pressedThumbWidth = Math.round(thumbWidth * THUMB_WIDTH_PRESSED_RATIO);
+      int delta = thumbWidth - pressedThumbWidth;
+      setThumbWidth(pressedThumbWidth);
+      setThumbTrackGapSize(thumbTrackGapSize - delta / 2);
+    }
+  }
+
   private double snapPosition(float position) {
     if (stepSize > 0.0f) {
       int stepCount = (int) ((valueTo - valueFrom) / stepSize);