Fix missing check causing layout some animation code to be executed w…

…hen it shouldn't Reviewed By: dmmiller Differential Revision: D3404149 fbshipit-source-id: 8663325fd3a4b9257d84075e22bd9cc59d6414ac
facebook · Jun 20, 2016 · a7a34a1 · a7a34a1
1 parent 3716ce7
commit a7a34a1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -348,7 +348,8 @@ public void manageChildren(
 
  View viewToRemove = viewToManage.getChildAt(indexToRemove);
 
- if (mLayoutAnimator.shouldAnimateLayout(viewToRemove) &&
+ if (mLayoutAnimationEnabled &&
+ mLayoutAnimator.shouldAnimateLayout(viewToRemove) &&
  arrayContains(tagsToDelete, viewToRemove.getId())) {
  // The view will be removed and dropped by the 'delete' layout animation
  // instead, so do nothing
@@ -395,7 +396,8 @@ public void manageChildren(
  tagsToDelete));
  }
 
- if (mLayoutAnimator.shouldAnimateLayout(viewToDestroy)) {
+ if (mLayoutAnimationEnabled &&
+ mLayoutAnimator.shouldAnimateLayout(viewToDestroy)) {
  mLayoutAnimator.deleteView(viewToDestroy, new LayoutAnimationListener() {
  @Override
  public void onAnimationEnd() {