From 173795c8169a8c5657ab0df4cac1d6a72915919f Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Wed, 14 Sep 2016 11:25:57 -0700
Subject: [PATCH] Reverted commit D3855801

Summary:
@public
Introduce `overflow:scroll` so that scrolling can be implemented without the current overflow:visible hackiness. Currently we use AT_MOST to measure in the cross axis but not in the main axis. This was done to enable scrolling containers where children are not constraint in the main axis by their parent. This caused problems for non-scrolling containers though as it meant that their children cannot be measured correctly in the main axis. Introducing `overflow:scroll` fixes this.

Reviewed By: astreet

Differential Revision: D3855801
---
 .../main/java/com/facebook/react/flat/FlatShadowNode.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
index d5581d03d29..07847f14d96 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -151,10 +151,9 @@ import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
     invalidate();
   }
 
-  @Override
-  public void setOverflow(String overflow) {
-    super.setOverflow(overflow);
-    mClipToBounds = !"visible".equals(overflow);
+  @ReactProp(name = "overflow")
+  public final void setOverflow(String overflow) {
+    mClipToBounds = "hidden".equals(overflow);
     if (mClipToBounds) {
       mOverflowsContainer = false;
       if (mClipRadius > DrawView.MINIMUM_ROUNDED_CLIPPING_VALUE) {