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

Merge "Fix FragmentTransaction.show() to show the fragment." into oc-dev

Browse Source 
am: 681ff5c7d8

Change-Id: I97976893f65b5f688f0319e5eaba5610bede73f4
This commit is contained in:
George Mount
2017-04-19 19:14:08 +00:00
committed by android-build-merger
parent dca07572d9 681ff5c7d8
commit 300a24c282
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1462,18 +1462,22 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
if (fragment.isHideReplaced()) {
fragment.setHideReplaced(false);
} else {
final ViewGroup container = fragment.mContainer;
final View animatingView = fragment.mView;
container.startViewTransition(animatingView);
// Delay the actual hide operation until the animation finishes, otherwise
// the fragment will just immediately disappear
anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
container.endViewTransition(animatingView);
animation.removeListener(this);
if (fragment.mView != null) {
fragment.mView.setVisibility(View.GONE);
}
animatingView.setVisibility(View.GONE);
}
});
}
} else {
fragment.mView.setVisibility(View.VISIBLE);
}
setHWLayerAnimListenerIfAlpha(fragment.mView, anim);
anim.start();