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

Commit c04ea526 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev am: 465a9560

am: 42cb4b1d

Change-Id: I8e6c92ff0c45e3a86efa9574bf14f85f7ec44134
parents 7c076b06 42cb4b1d
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -1380,8 +1380,13 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
                                    @Override
                                    public void onAnimationEnd(Animator anim) {
                                        container.endViewTransition(view);
                                        if (fragment.getAnimatingAway() != null) {
                                            fragment.setAnimatingAway(null);
                                        Animator animator = f.getAnimatingAway();
                                        f.setAnimatingAway(null);
                                        // If the animation finished immediately, the fragment's
                                        // view will still be there. If so, we can just pretend
                                        // there was no animation and skip the moveToState()
                                        if (container.indexOfChild(view) == -1
                                                && animator != null) {
                                            moveToState(fragment, fragment.getStateAfterAnimating(),
                                                    0, 0, false);
                                        }