From eb225fa17364ce275be6893a017b11c00504aa18 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 29 Aug 2018 15:35:42 -0700 Subject: [PATCH] Revert changes of the name for AndroidHorizontalScrollView Summary: This diff reverts the changes in the name for AndroidHorizontalScrollView and AndroidHorizontalScrollContentView that caused a redbox for continuous OTA users Reviewed By: fkgozali Differential Revision: D9561972 fbshipit-source-id: 3d8e9ee8bb6081107bc8d315af16885bb003148e --- Libraries/Components/ScrollView/ScrollView.js | 4 ++-- .../scroll/ReactHorizontalScrollContainerViewManager.java | 2 +- .../react/views/scroll/ReactHorizontalScrollViewManager.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index b40f0285d..aef48e3e1 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -47,10 +47,10 @@ let RCTScrollContentView; if (Platform.OS === 'android') { AndroidScrollView = requireNativeComponent('RCTScrollView'); AndroidHorizontalScrollView = requireNativeComponent( - 'RCTAndroidHorizontalScrollView', + 'AndroidHorizontalScrollView', ); AndroidHorizontalScrollContentView = requireNativeComponent( - 'RCTAndroidHorizontalScrollContentView', + 'AndroidHorizontalScrollContentView', ); } else if (Platform.OS === 'ios') { RCTScrollView = requireNativeComponent('RCTScrollView'); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java index 894e8286c..284f41451 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java @@ -14,7 +14,7 @@ import com.facebook.react.uimanager.ViewGroupManager; public class ReactHorizontalScrollContainerViewManager extends ViewGroupManager { - protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollContentView"; + protected static final String REACT_CLASS = "AndroidHorizontalScrollContentView"; public ReactHorizontalScrollContainerViewManager() {} diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java index 29e11e534..e6536a6e5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java @@ -37,7 +37,7 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager implements ReactScrollViewCommandHelper.ScrollCommandHandler { - protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollView"; + protected static final String REACT_CLASS = "AndroidHorizontalScrollView"; private static final int[] SPACING_TYPES = { Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,