From 74a00beeb7450df01821ae66dca67ef83639c215 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 9 Oct 2018 16:30:09 -0700
Subject: [PATCH] Enabled View falttening for Android builds

Summary: This diff enables view flattening for Android when using Fabric.

Reviewed By: shergin

Differential Revision: D10254678

fbshipit-source-id: cc7acaa38a6d01e112ba0e8a92db61cdeefbffee
---
 ReactCommon/fabric/components/view/ViewShadowNode.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.cpp b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
index d13ab64f7..1ef7a291b 100644
--- a/ReactCommon/fabric/components/view/ViewShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
@@ -13,13 +13,10 @@ namespace react {
 const char ViewComponentName[] = "View";
 
 bool ViewShadowNode::isLayoutOnly() const {
-#ifdef ANDROID
-  // This feature is not properly tested on Android yet.
-  return false;
-#else
   const auto &viewProps = *std::static_pointer_cast<const ViewProps>(props_);
 
   return
+      viewProps.collapsable &&
       // Event listeners
       !viewProps.onLayout &&
       // Generic Props
@@ -33,7 +30,6 @@ bool ViewShadowNode::isLayoutOnly() const {
       viewProps.transform == Transform{} && viewProps.zIndex == 0 &&
       // Layout Metrics
       getLayoutMetrics().borderWidth == EdgeInsets{};
-#endif
 }
 
 } // namespace react