diff --git a/lib/java/com/google/android/material/internal/CollapsingTextHelper.java b/lib/java/com/google/android/material/internal/CollapsingTextHelper.java index b9ee591afcc..df240962a84 100644 --- a/lib/java/com/google/android/material/internal/CollapsingTextHelper.java +++ b/lib/java/com/google/android/material/internal/CollapsingTextHelper.java @@ -19,6 +19,7 @@ import static androidx.core.util.Preconditions.checkNotNull; import static android.text.Layout.Alignment.ALIGN_NORMAL; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static java.lang.Math.max; import static java.lang.Math.min; import android.animation.TimeInterpolator; @@ -548,7 +549,7 @@ private void calculateOffsets(final float fraction) { } else { textBlendFraction = 1F; currentDrawX = collapsedDrawX; - currentDrawY = collapsedDrawY - currentOffsetY; + currentDrawY = collapsedDrawY - max(0, currentOffsetY); setInterpolatedTextSize(collapsedTextSize); }