From ffc0179b428a8cc48d630393e149935b50baa8f7 Mon Sep 17 00:00:00 2001 From: Kanade Date: Wed, 13 Sep 2017 09:15:00 +0800 Subject: [PATCH 1/2] fix #551 --- .../java/me/yokeyword/fragmentation/SupportFragmentDelegate.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java index 0019121d..8aa6abbd 100644 --- a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java +++ b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java @@ -160,7 +160,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { } if (savedInstanceState != null - || mRootStatus != STATUS_UN_ROOT || (mFragment.getTag() != null && mFragment.getTag().startsWith("android:switcher:")) || (mReplaceMode && !mFirstCreateView)) { notifyEnterAnimEnd(); From 426ec8f1521f4d1a8cf3f719f6d743a6f3fbe0c8 Mon Sep 17 00:00:00 2001 From: Kanade Date: Wed, 13 Sep 2017 13:00:14 +0800 Subject: [PATCH 2/2] fix #551 --- .../me/yokeyword/fragmentation/SupportFragmentDelegate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java index 8aa6abbd..d685b7dc 100644 --- a/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java +++ b/fragmentation_core/src/main/java/me/yokeyword/fragmentation/SupportFragmentDelegate.java @@ -122,8 +122,8 @@ public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) { enterAnim = mAnimHelper.getNoneAnim(); } else { enterAnim = mAnimHelper.enterAnim; + fixAnimationListener(enterAnim); } - fixAnimationListener(enterAnim); return enterAnim; } else { return mAnimHelper.popExitAnim; @@ -160,6 +160,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { } if (savedInstanceState != null + || mRootStatus == STATUS_ROOT_ANIM_DISABLE || (mFragment.getTag() != null && mFragment.getTag().startsWith("android:switcher:")) || (mReplaceMode && !mFirstCreateView)) { notifyEnterAnimEnd();