diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-12-10 01:27:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-10 01:27:41 +0000 |
| commit | 41c137b89fe0636d9f6ff5c473ce3f984ed06c40 (patch) | |
| tree | 881735284cd1b4e251851208417504a985b5129a | |
| parent | 80d53506830630e5ea962c9e9f27a06512d988fe (diff) | |
| parent | 6970bb682fd9f49aa80d74409fd653bad01fe982 (diff) | |
| download | support-41c137b89fe0636d9f6ff5c473ce3f984ed06c40.tar.gz | |
Merge "Ensure only transitioning fragments are made disappearing" into snap-temp-L95200000764559746
| -rw-r--r-- | fragment/fragment/src/main/java/androidx/fragment/app/FragmentContainerView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentContainerView.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentContainerView.java index cd15968ffe3..84142fb51f6 100644 --- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentContainerView.java +++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentContainerView.java @@ -369,7 +369,7 @@ public final class FragmentContainerView extends FrameLayout { * @param v {@link View} that might be added to list of disappearing views */ private void addDisappearingFragmentView(@NonNull View v) { - if (v.getAnimation() != null || (mTransitioningFragmentViews != null + if (v.getAnimation() != null && (mTransitioningFragmentViews != null && mTransitioningFragmentViews.contains(v))) { if (mDisappearingFragmentChildren == null) { mDisappearingFragmentChildren = new ArrayList<>(); |