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

Commit 69632a46 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Linking swipe animate to stateTransition to that it gets properly reset... 

Merge "Linking swipe animate to stateTransition to that it gets properly reset afterwards" into ub-launcher3-edmonton
parents e590e0b4 cc35bb88

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+1 −2
Original line number Diff line number Diff line
@@ -213,9 +213,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
                anim.play(shiftAnim);

            }



            // TODO: Link this animation to state animation, so that it is cancelled

            // automatically on state change

            anim.setDuration(transitionLength * 2);

            activity.getStateManager().setCurrentAnimation(anim);

            return AnimatorPlaybackController.wrap(anim, transitionLength * 2);

        }