Merge "Kill running animations on fragment view's when removed." into oc-dev

am: dcc7feb329 Change-Id: If86dd400ef47c543bd62d621f6a16cecf178014b
2017-04-21 00:06:58 +00:00
parent f8b8000261 dcc7feb329
commit d11fa9b032
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1334,6 +1334,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
                        f.performDestroyView();
                        dispatchOnFragmentViewDestroyed(f, false);
                        if (f.mView != null && f.mContainer != null) {
+                            // Stop any current animations:
+                            f.mView.clearAnimation();
+                            f.mContainer.endViewTransition(f.mView);
                            Animator anim = null;
                            if (mCurState > Fragment.INITIALIZING && !mDestroyed
                                    && f.mView.getVisibility() == View.VISIBLE