Skip to content

[Shape] Fix corner animation interruption during state changes while maintaining performance #4995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jayyaj12 wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −2
Open

[Shape] Fix corner animation interruption during state changes while maintaining performance #4995

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d847cb5
[MaterialShapeDrawable] Restore alpha06 corner animation behavior
jayyaj12 Jan 14, 2026
d54646d
[Shape] Fix corner animation interruption during state changes while …
jayyaj12 Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lib/java/com/google/android/material/shape/MaterialShapeDrawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Looper;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.util.Log;
import androidx.annotation.AttrRes;
Expand Down Expand Up @@ -185,6 +186,12 @@ public CornerSize apply(@NonNull CornerSize cornerSize) {
private boolean shadowBitmapDrawingEnable = true;

// Variables for corner morph.
// Tracks if this is the first non-empty bounds (for skipping initial animation).
private boolean boundsIsEmpty = true;
// Timestamp when state change occurred, used to allow animation during state transitions.
private long stateChangeTimestamp = 0;
// Duration (ms) to allow animation after state change, accounting for animation frames.
private static final long STATE_CHANGE_ANIMATION_WINDOW_MS = 500;
private boolean isRoundRectCornerMorph = true;
@NonNull private ShapeAppearanceModel strokeShapeAppearanceModel;
@Nullable private SpringForce cornerSpringForce;
Expand Down Expand Up @@ -1109,10 +1116,19 @@ protected void onBoundsChange(Rect bounds) {
pathDirty = true;
strokePathDirty = true;
super.onBoundsChange(bounds);

if (drawableState.shapeAppearance.isStateful() && !bounds.isEmpty()) {
// When bounds change, we want to snap to the new shape without animation.
updateShape(getState(), /* skipAnimation= */ true);
// Check if we're within the animation window after a state change.
long timeSinceStateChange = SystemClock.elapsedRealtime() - stateChangeTimestamp;
boolean isWithinStateChangeWindow = timeSinceStateChange < STATE_CHANGE_ANIMATION_WINDOW_MS;

// Skip animation if this is the first non-empty bounds OR outside state change window.
// Allow animation if we're within the window after a state change.
boolean skipAnimation = boundsIsEmpty || !isWithinStateChangeWindow;
updateShape(getState(), skipAnimation);
}

boundsIsEmpty = bounds.isEmpty();
}

@Override
Expand Down Expand Up @@ -1537,6 +1553,8 @@ public boolean isStateful() {
@Override
protected boolean onStateChange(int[] state) {
if (drawableState.shapeAppearance.isStateful()) {
// Record state change timestamp to allow animation within the time window.
stateChangeTimestamp = SystemClock.elapsedRealtime();
updateShape(state);
}
boolean paintColorChanged = updateColorsForState(state);
Expand Down