Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37c9f10a authored by Jeremy Sim's avatar Jeremy Sim Committed by Automerger Merge Worker
Browse files

Merge "Fix animation canceling crash bug (short swipe during split select)"... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539



Change-Id: Ie1a029935d313dd87ad663db298c04aa815f7d46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71d20b0e 7158d2d0

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);

                }