commit 6419a5cbc4f16157951724cf3d3e5de2b44a74f3
author George Mount <mount@google.com> Thu Jan 05 17:44:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 17:44:49 2017 +0000
tree 340abcf23c349e38c33f1e8621764f7ec6bc45f1
parent 52ce71d3434493f6c4298a83a46303c61d0a2bd3
parent 9b07983005689872240dee2084dec3520f95eb5a

Properly cancel the animation when saving the fragment state.
am: 9b07983005

Change-Id: Ibf6cbb6719186e36c073e0f49250cb5566ce9ca2

fragment/java/android/support/v4/app/FragmentManager.java

diff --git a/fragment/java/android/support/v4/app/FragmentManager.java b/fragment/java/android/support/v4/app/FragmentManager.java
index e7d13ff..ecc24d0 100644
--- a/fragment/java/android/support/v4/app/FragmentManager.java
+++ b/fragment/java/android/support/v4/app/FragmentManager.java
@@ -2355,7 +2355,10 @@
                 final int stateAfterAnimating = fragment.getStateAfterAnimating();
                 final View animatingAway = fragment.getAnimatingAway();
                 fragment.setAnimatingAway(null);
-                animatingAway.clearAnimation();
+                Animation animation = animatingAway.getAnimation();
+                if (animation != null) {
+                    animation.cancel();
+                }
                 moveToState(fragment, stateAfterAnimating, 0, 0, false);
             }
         }