Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 465a956066

Change-Id: Ieb8f17d3b1c345f27298dd4e461eaa7b780543b7
This commit is contained in:
George Mount
2017-09-14 02:19:59 +00:00
committed by android-build-merger
parent bd89855f46 465a956066
commit 42cb4b1d03
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/FragmentManager.java
View File

@@ -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);
}