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

Commit 6221b841 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix problem with empty AnimatorSet during fragment removal."...

Merge "Merge "Fix problem with empty AnimatorSet during fragment removal." into oc-mr1-dev am: 465a9560 am: 42cb4b1d"
parents 4d90833d c04ea526
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);
                                        }