From 7fea910d09a25b5b577bea980dffab18e5076d15 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Wed, 19 Apr 2017 12:05:43 -0700
Subject: Kill running animations on fragment view's when removed.

Bug 29274792

Stop animation and animators on the Fragment view from preventing
the view from being removed from the shadow view hierarchy.

Support Lib: I628b38f76357bce1ca7dd5c5c736f0f087d7bab4
Test: Ie9a11692ae883a72c17a042168feec42c698074e

Change-Id: I0ada7b4e75ef14c90038adf316b196e4cbcd6aaa
---
 core/java/android/app/FragmentManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 91578a2da9c7..2e342e3f218c 100644
--- 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
-- 
cgit v1.2.3-59-g8ed1b