[ProgressIndicator] Removed the call to draw a transparent full track.

PiperOrigin-RevId: 597992011
(cherry picked from commit b597c1e)

lib/java/com/google/android/material/progressindicator/DeterminateDrawable.java

@@ -237,8 +237,6 @@ public void draw(@NonNull Canvas canvas) {
     activeIndicator.color = baseSpec.indicatorColors[0];
     if (baseSpec.indicatorTrackGapSize > 0) {
       partialTrack.color = baseSpec.trackColor;
-      // Draws the full transparent track.
-      drawingDelegate.fillTrack(canvas, paint, /* drawableAlpha= */ 0);
       // Draws the indicator and track.
       int gapSize = baseSpec.indicatorTrackGapSize;
       // TODO: workaround to maintain pixel-perfect compatibility with drawing logic

lib/java/com/google/android/material/progressindicator/IndeterminateDrawable.java

@@ -22,7 +22,6 @@
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
@@ -209,20 +208,12 @@ public void draw(@NonNull Canvas canvas) {
     drawingDelegate.validateSpecAndAdjustCanvas(
         canvas, getBounds(), getGrowFraction(), isShowing(), isHiding());
 
-    if (initialIndicatorTrackGapSize > 0) {
-      if (drawingDelegate instanceof LinearDrawingDelegate) {
-        ((LinearProgressIndicatorSpec) drawingDelegate.spec).trackStopIndicatorSize = 0;
-      } else if (drawingDelegate instanceof CircularDrawingDelegate) {
-        baseSpec.indicatorTrackGapSize = 0;
-      }
-
-      // Draws the transparent track.
-      int trackColor = baseSpec.trackColor;
-      baseSpec.trackColor = Color.TRANSPARENT;
-      drawingDelegate.fillTrack(canvas, paint, getAlpha());
-      baseSpec.trackColor = trackColor;
-    } else {
+    if (initialIndicatorTrackGapSize == 0) {
       drawingDelegate.fillTrack(canvas, paint, getAlpha());
+    } else if (drawingDelegate instanceof LinearDrawingDelegate) {
+      ((LinearProgressIndicatorSpec) drawingDelegate.spec).trackStopIndicatorSize = 0;
+    } else if (drawingDelegate instanceof CircularDrawingDelegate) {
+      baseSpec.indicatorTrackGapSize = 0;
     }
 
     for (int indicatorIndex = 0;

lib/java/com/google/android/material/progressindicator/LinearDrawingDelegate.java

@@ -42,7 +42,7 @@ final class LinearDrawingDelegate extends DrawingDelegate<LinearProgressIndicato
   private float trackLength = 300f;
   private float displayedTrackThickness;
   private float displayedCornerRadius;
-  private Path displayedTrackPath;
+  private final Path displayedTrackPath;
 
   // This will be used in the ESCAPE hide animation. The start and end fraction in track will be
   // scaled by this fraction with a pivot of 1.0f.
@@ -52,6 +52,8 @@ final class LinearDrawingDelegate extends DrawingDelegate<LinearProgressIndicato
   /** Instantiates LinearDrawingDelegate with the current spec. */
   LinearDrawingDelegate(@NonNull LinearProgressIndicatorSpec spec) {
     super(spec);
+
+    displayedTrackPath = new Path();
   }
 
   @Override
@@ -83,7 +85,6 @@ void adjustCanvas(
       boolean isShowing,
       boolean isHiding) {
     trackLength = bounds.width();
-    float trackSize = spec.trackThickness;
 
     // Positions canvas to center of the clip bounds.
     canvas.translate(
@@ -110,13 +111,22 @@ void adjustCanvas(
       totalTrackLengthFraction = 1f;
     }
 
-    // Clips all drawing to the track area, so it doesn't draw outside of its bounds (which can
-    // happen in certain configurations of clipToPadding and clipChildren)
-    canvas.clipRect(-trackLength / 2, -trackSize / 2, trackLength / 2, trackSize / 2);
-
     // These are set for the drawing the indicator and track.
     displayedTrackThickness = spec.trackThickness * trackThicknessFraction;
     displayedCornerRadius = spec.trackCornerRadius * trackThicknessFraction;
+
+    // Clips all drawing to the track area, so it doesn't draw outside of its bounds (which can
+    // happen in certain configurations of clipToPadding and clipChildren)
+    float right = trackLength / 2;
+    float left = right - trackLength * totalTrackLengthFraction;
+    float bottom = displayedTrackThickness / 2;
+    displayedTrackPath.rewind();
+    displayedTrackPath.addRoundRect(
+        new RectF(left, -bottom, right, bottom),
+        displayedCornerRadius,
+        displayedCornerRadius,
+        Path.Direction.CCW);
+    canvas.clipPath(displayedTrackPath);
   }
 
   @Override
@@ -159,7 +169,6 @@ void fillIndicator(
 
     canvas.save();
     // Avoid the indicator being drawn out of the track.
-    canvas.clipPath(displayedTrackPath);
     RectF indicatorBounds =
         new RectF(
             adjustedStartX,
@@ -182,15 +191,6 @@ void fillTrack(
     paint.setAntiAlias(true);
     paint.setColor(trackColor);
 
-    float right = trackLength / 2;
-    float left = right - trackLength * totalTrackLengthFraction;
-    float bottom = displayedTrackThickness / 2;
-    displayedTrackPath = new Path();
-    displayedTrackPath.addRoundRect(
-        new RectF(left, -bottom, right, bottom),
-        displayedCornerRadius,
-        displayedCornerRadius,
-        Path.Direction.CCW);
     canvas.drawPath(displayedTrackPath, paint);
   }
 
@@ -208,7 +208,6 @@ void drawStopIndicator(
       paint.setColor(paintColor);
       canvas.save();
       // Avoid the indicator being drawn out of the track.
-      canvas.clipPath(displayedTrackPath);
       Rect trackBounds = canvas.getClipBounds();
       float offset = max(0, displayedTrackThickness - spec.trackStopIndicatorSize);
       RectF stopBounds =