From 8eebc931bc8b5f5beb9bf32b1bba48537ad81c69 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 18 Oct 2022 13:32:03 -0700 Subject: [PATCH] Ship insertZReorderBarriersOnViewGroupChildren Summary: Ship insertZReorderBarriersOnViewGroupChildren changelog: [internal] internal Reviewed By: makovkastar Differential Revision: D40403388 fbshipit-source-id: bf13f6a7af92c0c4fd3377a547a56b163dfe29ed --- .../java/com/facebook/react/config/ReactFeatureFlags.java | 2 -- .../java/com/facebook/react/views/view/ReactViewGroup.java | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 4574169ce00..02bdfb07c84 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -82,8 +82,6 @@ public class ReactFeatureFlags { /** Feature Flag to use overflowInset values provided by Yoga */ public static boolean useOverflowInset = false; - public static boolean insertZReorderBarriersOnViewGroupChildren = true; - public static boolean dispatchPointerEvents = false; /** Feature Flag to enable the pending event queue in fabric before mounting views */ 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 93afe79dc7f..0d39356857e 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 @@ -33,7 +33,6 @@ import com.facebook.react.bridge.ReactNoCrashSoftException; import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.annotations.VisibleForTesting; -import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.modules.i18nmanager.I18nUtil; import com.facebook.react.touch.OnInterceptTouchEventListener; import com.facebook.react.touch.ReactHitSlopView; @@ -828,8 +827,7 @@ public class ReactViewGroup extends ViewGroup @Override protected boolean drawChild(Canvas canvas, View child, long drawingTime) { - boolean drawWithZ = - child.getElevation() > 0 && ReactFeatureFlags.insertZReorderBarriersOnViewGroupChildren; + boolean drawWithZ = child.getElevation() > 0; if (drawWithZ) { CanvasUtil.enableZ(canvas, true);