Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev (7158d2d0) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/statemanager/StateManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}