Merge pull request #552 from pye52/master

Fix #551, fix the fragment loaded by `loadRootFragment()` was callback twice
YoKeyword · Sep 13, 2017 · 62d30ac · 62d30ac
2 parents 7943fdf + 426ec8f
commit 62d30ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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,7 +160,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         }
 
         if (savedInstanceState != null
-                || mRootStatus != STATUS_UN_ROOT
+                || mRootStatus == STATUS_ROOT_ANIM_DISABLE
                 || (mFragment.getTag() != null && mFragment.getTag().startsWith("android:switcher:"))
                 || (mReplaceMode && !mFirstCreateView)) {
             notifyEnterAnimEnd();