Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev

2023-05-11 22:31:34 +00:00
parent c110587dba 7f169c7c6d
commit 7158d2d0e2
1 changed files with 4 additions and 2 deletions
@@ -229,8 +229,10 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
                    listener.onAnimationEnd(null);
                }
                return;
-            } else if (!mConfig.userControlled && animated && mConfig.targetState == state) {
-                // We are running the same animation as requested
+            } else if ((!mConfig.userControlled && animated && mConfig.targetState == state)
+                    || mState.shouldPreserveDataStateOnReapply()) {
+                // We are running the same animation as requested, and/or target state should not be
+                // reset -- allow the current animation to complete instead of canceling it.
                if (listener != null) {
                    mConfig.currentAnimation.addListener(listener);
                }