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

Commit 3d7ea7aa 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 am: 37c9f10a

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



Change-Id: I355dcde40d6fcbd6bec6fdd3ef36a09b2dbbf722
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38ccd68d 37c9f10a

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

                }