diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index 1317c6e43de..006feb2ffac 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -460,11 +460,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView try { if (super.onInterceptTouchEvent(ev)) { - NativeGestureUtil.notifyNativeGestureStarted(this, ev); - ReactScrollViewHelper.emitScrollBeginDragEvent(this); - mDragging = true; - enableFpsListener(); - getFlingAnimator().cancel(); + handleInterceptedTouchEvent(ev); return true; } } catch (IllegalArgumentException e) { @@ -477,6 +473,14 @@ public class ReactHorizontalScrollView extends HorizontalScrollView return false; } + protected void handleInterceptedTouchEvent(MotionEvent ev) { + NativeGestureUtil.notifyNativeGestureStarted(this, ev); + ReactScrollViewHelper.emitScrollBeginDragEvent(this); + mDragging = true; + enableFpsListener(); + getFlingAnimator().cancel(); + } + @Override public boolean pageScroll(int direction) { boolean handled = super.pageScroll(direction); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index 3fbfb7a4d52..32261eb3dc9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -340,11 +340,7 @@ public class ReactScrollView extends ScrollView try { if (super.onInterceptTouchEvent(ev)) { - NativeGestureUtil.notifyNativeGestureStarted(this, ev); - ReactScrollViewHelper.emitScrollBeginDragEvent(this); - mDragging = true; - enableFpsListener(); - getFlingAnimator().cancel(); + handleInterceptedTouchEvent(ev); return true; } } catch (IllegalArgumentException e) { @@ -357,6 +353,14 @@ public class ReactScrollView extends ScrollView return false; } + protected void handleInterceptedTouchEvent(MotionEvent ev) { + NativeGestureUtil.notifyNativeGestureStarted(this, ev); + ReactScrollViewHelper.emitScrollBeginDragEvent(this); + mDragging = true; + enableFpsListener(); + getFlingAnimator().cancel(); + } + @Override public boolean onTouchEvent(MotionEvent ev) { if (!mScrollEnabled) {