Merge "Fix animation not playing when going home while another animation is...

package com.android.launcher3;

import static android.view.View.VISIBLE;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;

            }

        }

        // Cancel the current animation

        // Cancel the current animation. This will reset mState to mCurrentStableState, so store it.

        LauncherState fromState = mState;

        mConfig.reset();

        if (!animated) {

        // Since state NORMAL can be reached from multiple states, just assume that the

        // transition plays in reverse and use the same duration as previous state.

        mConfig.duration = state == NORMAL ? mState.transitionDuration : state.transitionDuration;

        mConfig.duration = state == NORMAL ? fromState.transitionDuration : state.transitionDuration;

        AnimatorSetBuilder builder = new AnimatorSetBuilder();

        prepareForAtomicAnimation(mState, state, builder);

        prepareForAtomicAnimation(fromState, state, builder);

        AnimatorSet animation = createAnimationToNewWorkspaceInternal(

                state, builder, onCompleteRunnable);

        Runnable runnable = new StartAnimRunnable(animation);