From 59aada873e13bf0b1f5e3a10cfe9a5a45c28f9fb Mon Sep 17 00:00:00 2001 From: "Andrew Chen (Eng)" Date: Tue, 25 Sep 2018 11:47:11 -0700 Subject: [PATCH] Remove overflow hidden killswitch Summary: There hasn't been any reports of overflow issues since the last issue was fixed in v183 (July 30th). Let's remove this flag Reviewed By: yungsters Differential Revision: D10020006 fbshipit-source-id: 593c7d2c2bef5f0bd60d5de1941cd58f7fd6ccc7 --- .../src/main/java/com/facebook/react/ReactRootView.java | 4 +--- .../main/java/com/facebook/react/uimanager/ViewProps.java | 5 ----- .../java/com/facebook/react/views/view/ReactViewGroup.java | 5 +---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 265a961db..4178ba21a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -112,9 +112,7 @@ public class ReactRootView extends SizeMonitoringFrameLayout } private void init() { - if (!ViewProps.sDefaultOverflowHidden) { - setClipChildren(false); - } + setClipChildren(false); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java index 99e5dfbbd..7b38c5499 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java @@ -17,11 +17,6 @@ import java.util.HashSet; */ public class ViewProps { - /** - * Kill switch to make overflow hidden by default. This flag will eventually be removed. - */ - public static boolean sDefaultOverflowHidden; - public static final String VIEW_CLASS_NAME = "RCTView"; // Layout only (only affect positions of children, causes no drawing) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java index ff4374a20..b4ab88371 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java @@ -115,10 +115,7 @@ public class ReactViewGroup extends ViewGroup implements public ReactViewGroup(Context context) { super(context); - // TODO: Remove this check after a couple public releases. - if (!ViewProps.sDefaultOverflowHidden) { - setClipChildren(false); - } + setClipChildren(false); mDrawingOrderHelper = new ViewGroupDrawingOrderHelper(this); }