[TopAppBar] Make letter spacing dependent on text size in CollapsingTextHelper

Resolves #4640

GIT_ORIGIN_REV_ID=587f81fd992281152fb9a0c83ae74d47cde4c3a0
PiperOrigin-RevId: 854203889

Author: pubiqq

lib/java/com/google/android/material/internal/CollapsingTextHelper.java

@@ -696,6 +696,17 @@ private void calculateOffsets(final float fraction) {
       currentDrawY = lerp(expandedDrawY, collapsedDrawY, fraction, positionInterpolator);
 
       setInterpolatedTextSize(fraction);
+
+      if (collapsedLetterSpacing != expandedLetterSpacing) {
+        textPaint.setLetterSpacing(
+            lerp(
+                expandedLetterSpacing,
+                collapsedLetterSpacing,
+                fraction,
+                AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR));
+      } else {
+        textPaint.setLetterSpacing(collapsedLetterSpacing);
+      }
     }
 
     setCollapsedTextBlend(
@@ -712,17 +723,6 @@ private void calculateOffsets(final float fraction) {
       textPaint.setColor(getCurrentCollapsedTextColor());
     }
 
-    if (collapsedLetterSpacing != expandedLetterSpacing) {
-      textPaint.setLetterSpacing(
-          lerp(
-              expandedLetterSpacing,
-              collapsedLetterSpacing,
-              fraction,
-              AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR));
-    } else {
-      textPaint.setLetterSpacing(collapsedLetterSpacing);
-    }
-
     // Calculates paint parameters for shadow layer.
     currentShadowRadius = lerp(expandedShadowRadius, collapsedShadowRadius, fraction, null);
     currentShadowDx = lerp(expandedShadowDx, collapsedShadowDx, fraction, null);
@@ -1320,11 +1320,11 @@ public void setStaticLayoutBuilderConfigurer(
   }
 
   /**
-   * Returns true if {@code value} is 'close' to it's closest decimal value. Close is currently
+   * Returns true if {@code value1} is 'close' to {@code value2}. Close is currently
    * defined as it's difference being < 0.00001.
    */
-  private static boolean isClose(float value, float targetValue) {
-    return Math.abs(value - targetValue) < 0.00001f;
+  private static boolean isClose(float value1, float value2) {
+    return Math.abs(value1 - value2) < 0.00001f;
   }
 
   public ColorStateList getExpandedTextColor() {