Ensure fragments animate in the same direction
When using the new state manager, the last fragment operation should
always determine the direction of the special effects. So if the
transactions are forward -> forward -> pop, the special effects should
all be pop type since the last transaction was a pop.
RelNote: "When running both `popBackStack()` and `commit()` operations
together, the last operation will now set the direction for all
animations rather than running some pop animations and some enter
animations."
Test: removePopExitAnimation
Bug: 181142246
Change-Id: I7072e2c8008318ae812ae461a42ddafbbe6055cd
(cherry picked from commit 4c702a921f39729d3d8e5af981a787c25b195ff1)
diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.kt
index c5706ec..802a75e 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.kt
@@ -799,6 +799,35 @@
}
}
+ @Test
+ fun removePopExitAnimation() {
+ waitForAnimationReady()
+ val fm = activityRule.activity.supportFragmentManager
+ val fragment1 = AnimationFragment()
+ val fragment2 = AnimationFragment()
+
+ fm.beginTransaction()
+ .setReorderingAllowed(true)
+ .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+ .add(R.id.fragmentContainer, fragment1, "fragment1")
+ .addToBackStack("fragment1")
+ .commit()
+ activityRule.waitForExecution()
+
+ activityRule.runOnUiThread {
+ fm.popBackStack()
+ fm.beginTransaction()
+ .setReorderingAllowed(true)
+ .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+ .replace(R.id.fragmentContainer, fragment2, "fragment2")
+ .addToBackStack("fragment2")
+ .commit()
+ }
+ activityRule.waitForExecution()
+
+ assertThat(fragment1.loadedAnimation).isEqualTo(EXIT)
+ }
+
private fun assertEnterPopExit(fragment: AnimationFragment) {
assertFragmentAnimation(fragment, 1, true, ENTER)
@@ -848,7 +877,10 @@
assertThat(fragment.animation).isNotNull()
assertThat(fragment.animation!!.waitForEnd(1000)).isTrue()
assertThat(fragment.animation?.hasStarted()!!).isTrue()
- assertThat(fragment.nextAnim).isEqualTo(0)
+ assertThat(fragment.enterAnim).isEqualTo(0)
+ assertThat(fragment.exitAnim).isEqualTo(0)
+ assertThat(fragment.popEnterAnim).isEqualTo(0)
+ assertThat(fragment.popExitAnim).isEqualTo(0)
}
private fun assertPostponed(fragment: AnimationFragment, expectedAnimators: Int) {
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java
index da114c4..d38ef521 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/BackStackRecord.java
@@ -404,34 +404,30 @@
final Op op = mOps.get(opNum);
final Fragment f = op.mFragment;
if (f != null) {
+ f.setPopDirection(false);
+ f.setAnimations(op.mEnterAnim, op.mExitAnim, op.mPopEnterAnim, op.mPopExitAnim);
f.setNextTransition(mTransition);
f.setSharedElementNames(mSharedElementSourceNames, mSharedElementTargetNames);
}
switch (op.mCmd) {
case OP_ADD:
- f.setNextAnim(op.mEnterAnim);
mManager.setExitAnimationOrder(f, false);
mManager.addFragment(f);
break;
case OP_REMOVE:
- f.setNextAnim(op.mExitAnim);
mManager.removeFragment(f);
break;
case OP_HIDE:
- f.setNextAnim(op.mExitAnim);
mManager.hideFragment(f);
break;
case OP_SHOW:
- f.setNextAnim(op.mEnterAnim);
mManager.setExitAnimationOrder(f, false);
mManager.showFragment(f);
break;
case OP_DETACH:
- f.setNextAnim(op.mExitAnim);
mManager.detachFragment(f);
break;
case OP_ATTACH:
- f.setNextAnim(op.mEnterAnim);
mManager.setExitAnimationOrder(f, false);
mManager.attachFragment(f);
break;
@@ -471,35 +467,31 @@
final Op op = mOps.get(opNum);
Fragment f = op.mFragment;
if (f != null) {
+ f.setPopDirection(true);
+ f.setAnimations(op.mEnterAnim, op.mExitAnim, op.mPopEnterAnim, op.mPopExitAnim);
f.setNextTransition(FragmentManager.reverseTransit(mTransition));
// Reverse the target and source names for pop operations
f.setSharedElementNames(mSharedElementTargetNames, mSharedElementSourceNames);
}
switch (op.mCmd) {
case OP_ADD:
- f.setNextAnim(op.mPopExitAnim);
mManager.setExitAnimationOrder(f, true);
mManager.removeFragment(f);
break;
case OP_REMOVE:
- f.setNextAnim(op.mPopEnterAnim);
mManager.addFragment(f);
break;
case OP_HIDE:
- f.setNextAnim(op.mPopEnterAnim);
mManager.showFragment(f);
break;
case OP_SHOW:
- f.setNextAnim(op.mPopExitAnim);
mManager.setExitAnimationOrder(f, true);
mManager.hideFragment(f);
break;
case OP_DETACH:
- f.setNextAnim(op.mPopEnterAnim);
mManager.attachFragment(f);
break;
case OP_ATTACH:
- f.setNextAnim(op.mPopExitAnim);
mManager.setExitAnimationOrder(f, true);
mManager.detachFragment(f);
break;
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java b/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
index 247065a..88f0e80 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.java
@@ -89,7 +89,7 @@
CancellationSignal animCancellationSignal = new CancellationSignal();
operation.markStartedSpecialEffect(animCancellationSignal);
// Add the animation special effect
- animations.add(new AnimationInfo(operation, animCancellationSignal));
+ animations.add(new AnimationInfo(operation, animCancellationSignal, isPop));
// Create the transition CancellationSignal
CancellationSignal transitionCancellationSignal = new CancellationSignal();
@@ -777,12 +777,15 @@
private static class AnimationInfo extends SpecialEffectsInfo {
+ private boolean mIsPop;
private boolean mLoadedAnim = false;
@Nullable
private FragmentAnim.AnimationOrAnimator mAnimation;
- AnimationInfo(@NonNull Operation operation, @NonNull CancellationSignal signal) {
+ AnimationInfo(@NonNull Operation operation, @NonNull CancellationSignal signal,
+ boolean isPop) {
super(operation, signal);
+ mIsPop = isPop;
}
@Nullable
@@ -792,7 +795,8 @@
}
mAnimation = FragmentAnim.loadAnimation(context,
getOperation().getFragment(),
- getOperation().getFinalState() == Operation.State.VISIBLE);
+ getOperation().getFinalState() == Operation.State.VISIBLE,
+ mIsPop);
mLoadedAnim = true;
return mAnimation;
}
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
index 855d127..61656a5 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
@@ -2850,8 +2850,19 @@
writer.print(" mTargetRequestCode=");
writer.println(mTargetRequestCode);
}
- if (getNextAnim() != 0) {
- writer.print(prefix); writer.print("mNextAnim="); writer.println(getNextAnim());
+ writer.print(prefix); writer.print("mPopDirection="); writer.println(getPopDirection());
+ if (getEnterAnim() != 0) {
+ writer.print(prefix); writer.print("getEnterAnim="); writer.println(getEnterAnim());
+ }
+ if (getExitAnim() != 0) {
+ writer.print(prefix); writer.print("getExitAnim="); writer.println(getExitAnim());
+ }
+ if (getPopEnterAnim() != 0) {
+ writer.print(prefix); writer.print("getPopEnterAnim=");
+ writer.println(getPopEnterAnim());
+ }
+ if (getPopExitAnim() != 0) {
+ writer.print(prefix); writer.print("getPopExitAnim="); writer.println(getPopExitAnim());
}
if (mContainer != null) {
writer.print(prefix); writer.print("mContainer="); writer.println(mContainer);
@@ -3255,18 +3266,56 @@
return mAnimationInfo;
}
- int getNextAnim() {
+ void setAnimations(int enter, int exit, int popEnter, int popExit) {
+ if (mAnimationInfo == null && enter == 0 && exit == 0 && popEnter == 0 && popExit == 0) {
+ return; // no change!
+ }
+ ensureAnimationInfo().mEnterAnim = enter;
+ ensureAnimationInfo().mExitAnim = exit;
+ ensureAnimationInfo().mPopEnterAnim = popEnter;
+ ensureAnimationInfo().mPopExitAnim = popExit;
+ }
+
+ int getEnterAnim() {
if (mAnimationInfo == null) {
return 0;
}
- return mAnimationInfo.mNextAnim;
+ return mAnimationInfo.mEnterAnim;
}
- void setNextAnim(int animResourceId) {
- if (mAnimationInfo == null && animResourceId == 0) {
+ int getExitAnim() {
+ if (mAnimationInfo == null) {
+ return 0;
+ }
+ return mAnimationInfo.mExitAnim;
+ }
+
+ int getPopEnterAnim() {
+ if (mAnimationInfo == null) {
+ return 0;
+ }
+ return mAnimationInfo.mPopEnterAnim;
+ }
+
+ int getPopExitAnim() {
+ if (mAnimationInfo == null) {
+ return 0;
+ }
+ return mAnimationInfo.mPopExitAnim;
+ }
+
+ boolean getPopDirection() {
+ if (mAnimationInfo == null) {
+ return false;
+ }
+ return mAnimationInfo.mIsPop;
+ }
+
+ void setPopDirection(boolean isPop) {
+ if (mAnimationInfo == null) {
return; // no change!
}
- ensureAnimationInfo().mNextAnim = animResourceId;
+ ensureAnimationInfo().mIsPop = isPop;
}
int getNextTransition() {
@@ -3516,8 +3565,14 @@
// animator instead of an animation.
Animator mAnimator;
- // If app has requested a specific animation, this is the one to use.
- int mNextAnim;
+ // If app requests the animation direction, this is what to use
+ boolean mIsPop;
+
+ // All possible animations
+ int mEnterAnim;
+ int mExitAnim;
+ int mPopEnterAnim;
+ int mPopExitAnim;
// If app has requested a specific transition, this is the one to use.
int mNextTransition;
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentAnim.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentAnim.java
index 76f34ef..ea9f4eb 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentAnim.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentAnim.java
@@ -42,11 +42,11 @@
}
static AnimationOrAnimator loadAnimation(@NonNull Context context,
- @NonNull Fragment fragment, boolean enter) {
+ @NonNull Fragment fragment, boolean enter, boolean isPop) {
int transit = fragment.getNextTransition();
- int nextAnim = fragment.getNextAnim();
- // Clear the Fragment animation
- fragment.setNextAnim(0);
+ int nextAnim = getNextAnim(fragment, enter, isPop);
+ // Clear the Fragment animations
+ fragment.setAnimations(0, 0, 0, 0);
// We do not need to keep up with the removing Fragment after we get its next animation.
// If transactions do not allow reordering, this will always be true and the visible
// removing fragment will be cleared. If reordering is allowed, this will only be true
@@ -117,6 +117,22 @@
return null;
}
+ private static int getNextAnim(Fragment fragment, boolean enter, boolean isPop) {
+ if (isPop) {
+ if (enter) {
+ return fragment.getPopEnterAnim();
+ } else {
+ return fragment.getPopExitAnim();
+ }
+ } else {
+ if (enter) {
+ return fragment.getEnterAnim();
+ } else {
+ return fragment.getExitAnim();
+ }
+ }
+ }
+
/**
* Animates the removal of a fragment with the given animator or animation. After animating,
* the fragment's view will be removed from the hierarchy.
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
index 2dd3be17..f155dc6 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/FragmentManager.java
@@ -1419,7 +1419,7 @@
&& f.mView.getVisibility() == View.VISIBLE
&& f.mPostponedAlpha >= 0) {
anim = FragmentAnim.loadAnimation(mHost.getContext(),
- f, false);
+ f, false, f.getPopDirection());
}
f.mPostponedAlpha = 0;
// Robolectric tests do not post the animation like a real device
@@ -1535,7 +1535,7 @@
private void completeShowHideFragment(@NonNull final Fragment fragment) {
if (fragment.mView != null) {
FragmentAnim.AnimationOrAnimator anim = FragmentAnim.loadAnimation(
- mHost.getContext(), fragment, !fragment.mHidden);
+ mHost.getContext(), fragment, !fragment.mHidden, fragment.getPopDirection());
if (anim != null && anim.animator != null) {
anim.animator.setTarget(fragment.mView);
if (fragment.mHidden) {
@@ -1607,7 +1607,7 @@
f.mIsNewlyAdded = false;
// run animations:
FragmentAnim.AnimationOrAnimator anim = FragmentAnim.loadAnimation(
- mHost.getContext(), f, true);
+ mHost.getContext(), f, true, f.getPopDirection());
if (anim != null) {
if (anim.animation != null) {
f.mView.startAnimation(anim.animation);
@@ -2414,12 +2414,14 @@
*/
private void setVisibleRemovingFragment(@NonNull Fragment f) {
ViewGroup container = getFragmentContainer(f);
- if (container != null && f.getNextAnim() > 0) {
+ if (container != null
+ && f.getEnterAnim() + f.getExitAnim() + f.getPopEnterAnim() + f.getPopExitAnim() > 0
+ ) {
if (container.getTag(R.id.visible_removing_fragment_view_tag) == null) {
container.setTag(R.id.visible_removing_fragment_view_tag, f);
}
((Fragment) container.getTag(R.id.visible_removing_fragment_view_tag))
- .setNextAnim(f.getNextAnim());
+ .setPopDirection(f.getPopDirection());
}
}