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

Commit 813ab5c8 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3ad0ccd0-ca7c-4572-b131-aa4fe70fe454" into... 

Merge changes from topic "am-3ad0ccd0-ca7c-4572-b131-aa4fe70fe454" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Fix animation not playing when going home while another animation is playing am: 67f9cad7
  Fix animation not playing when going home while another animation is playing
parents a3e47fe8 7b774036

src/com/android/launcher3/LauncherStateManager.java

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
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;
@@ -222,7 +221,8 @@ public class LauncherStateManager { 
            }

        }



        // Cancel the current animation

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

        LauncherState fromState = mState;

        mConfig.reset();



        if (!animated) {
@@ -245,10 +245,10 @@ public class LauncherStateManager { 


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