Skip to content

Commit

Permalink
Fix timestamps on android touch events to use milliseconds, to be con…
Browse files Browse the repository at this point in the history 
…sistent with iOS

Summary:
So `PanReponder.onPanResponderRelease/onPanResponderTerminate` receive a `gestureState` object containing a `onPanResponderTerminate.vx/vy` property. On Android and iOS, they appear to be orders of magnitude different, which appear to be due to the different scale of timestamps that are used when generating touch events.

This pull request fixes the timestamps to be milliseconds on both platforms (since I assume iOS is the more authoritative one, and is the one that `react-native-viewpager`'s vx thresholds written written to compare against.)

As far as I can tell, the RN code doesn't use the `vx/vy` properties, so they should be okay. And looks like the RN code only cares about relative values of `startTimestamp/currentTimestamp/previousTimestamp` though, so should be fine too. it's quite possible there will be downstream android breakage with this change, particularly for those who are already compensating for the RN discrepancy.
Closes #8199

Differential Revision: D3528215

Pulled By: dmmiller

fbshipit-source-id: cbd25bb7e7bb87fa77b661a057643a6ea97bc3f1
  • Loading branch information
@mikelambert
mikelambert authored and Facebook Github Bot 2 committed Jul 7, 2016
1 parent f534560 commit 4f5c2b4
Show file tree
Hide file tree
Showing 20 changed files with 57 additions and 53 deletions.
12 changes: 6 additions & 6 deletions ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextChangedEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
newText.toString(),
(int) PixelUtil.toDIPFromPixel(contentWidth),
(int) PixelUtil.toDIPFromPixel(contentHeight),
Expand All @@ -125,7 +125,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextInputEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
newText.toString(),
"",
start,
Expand All @@ -150,7 +150,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextChangedEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
newText.toString(),
(int) PixelUtil.toDIPFromPixel(contentWidth),
(int) PixelUtil.toDIPFromPixel(contentHeight),
Expand All @@ -159,7 +159,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextInputEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
moreText,
"",
start,
Expand All @@ -184,7 +184,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextChangedEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
newText.toString(),
(int) PixelUtil.toDIPFromPixel(contentWidth),
(int) PixelUtil.toDIPFromPixel(contentHeight),
Expand All @@ -193,7 +193,7 @@ public void testMetionsInputColors() throws Throwable {
eventDispatcher.dispatchEvent(
new ReactTextInputEvent(
reactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
moreText,
"",
start,
Expand Down
4 changes: 4 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ public static long currentTimeMillis() {
public static long nanoTime() {
return System.nanoTime();
}

public static long elapsedRealtime() {
return android.os.SystemClock.elapsedRealtime();
}
}
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public void createTimer(
return;
}

long initialTargetTime = SystemClock.nanoTime() / 1000000 + adjustedDuration;
long initialTargetTime = SystemClock.elapsedRealtime() + adjustedDuration;
Timer timer = new Timer(executorToken, callbackID, initialTargetTime, duration, repeat);
synchronized (mTimerGuard) {
mTimers.add(timer);
Expand Down
12 changes: 6 additions & 6 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
eventDispatcher.dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.START,
ev,
mTargetCoordinates[0],
Expand All @@ -105,7 +105,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
eventDispatcher.dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.END,
ev,
mTargetCoordinates[0],
Expand All @@ -117,7 +117,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
eventDispatcher.dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.MOVE,
ev,
mTargetCoordinates[0],
Expand All @@ -128,7 +128,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
eventDispatcher.dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.START,
ev,
mTargetCoordinates[0],
Expand All @@ -139,7 +139,7 @@ public void handleTouchEvent(MotionEvent ev, EventDispatcher eventDispatcher) {
eventDispatcher.dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.END,
ev,
mTargetCoordinates[0],
Expand Down Expand Up @@ -180,7 +180,7 @@ private void dispatchCancelEvent(MotionEvent androidEvent, EventDispatcher event
Assertions.assertNotNull(eventDispatcher).dispatchEvent(
TouchEvent.obtain(
mTargetTag,
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
TouchEventType.CANCEL,
androidEvent,
mTargetCoordinates[0],
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private OnLayoutEvent() {
}

protected void init(int viewTag, int x, int y, int width, int height) {
super.init(viewTag, SystemClock.nanoTime());
super.init(viewTag, SystemClock.elapsedRealtime());
mX = x;
mY = y;
mWidth = width;
Expand Down
8 changes: 4 additions & 4 deletions ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,25 +188,25 @@ public DrawerEventEmitter(DrawerLayout drawerLayout, EventDispatcher eventDispat
@Override
public void onDrawerSlide(View view, float v) {
mEventDispatcher.dispatchEvent(
new DrawerSlideEvent(mDrawerLayout.getId(), SystemClock.nanoTime(), v));
new DrawerSlideEvent(mDrawerLayout.getId(), SystemClock.elapsedRealtime(), v));
}

@Override
public void onDrawerOpened(View view) {
mEventDispatcher.dispatchEvent(
new DrawerOpenedEvent(mDrawerLayout.getId(), SystemClock.nanoTime()));
new DrawerOpenedEvent(mDrawerLayout.getId(), SystemClock.elapsedRealtime()));
}

@Override
public void onDrawerClosed(View view) {
mEventDispatcher.dispatchEvent(
new DrawerClosedEvent(mDrawerLayout.getId(), SystemClock.nanoTime()));
new DrawerClosedEvent(mDrawerLayout.getId(), SystemClock.elapsedRealtime()));
}

@Override
public void onDrawerStateChanged(int i) {
mEventDispatcher.dispatchEvent(
new DrawerStateChangedEvent(mDrawerLayout.getId(), SystemClock.nanoTime(), i));
new DrawerStateChangedEvent(mDrawerLayout.getId(), SystemClock.elapsedRealtime(), i));
}
}
}
10 changes: 5 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void setShouldNotifyLoadEvents(boolean shouldNotify) {
@Override
public void onSubmit(String id, Object callerContext) {
mEventDispatcher.dispatchEvent(
new ImageLoadEvent(getId(), SystemClock.nanoTime(), ImageLoadEvent.ON_LOAD_START));
new ImageLoadEvent(getId(), SystemClock.elapsedRealtime(), ImageLoadEvent.ON_LOAD_START));
}

@Override
Expand All @@ -202,18 +202,18 @@ public void onFinalImageSet(
@Nullable Animatable animatable) {
if (imageInfo != null) {
mEventDispatcher.dispatchEvent(
new ImageLoadEvent(getId(), SystemClock.nanoTime(), ImageLoadEvent.ON_LOAD));
new ImageLoadEvent(getId(), SystemClock.elapsedRealtime(), ImageLoadEvent.ON_LOAD));
mEventDispatcher.dispatchEvent(
new ImageLoadEvent(getId(), SystemClock.nanoTime(), ImageLoadEvent.ON_LOAD_END));
new ImageLoadEvent(getId(), SystemClock.elapsedRealtime(), ImageLoadEvent.ON_LOAD_END));
}
}

@Override
public void onFailure(String id, Throwable throwable) {
mEventDispatcher.dispatchEvent(
new ImageLoadEvent(getId(), SystemClock.nanoTime(), ImageLoadEvent.ON_ERROR));
new ImageLoadEvent(getId(), SystemClock.elapsedRealtime(), ImageLoadEvent.ON_ERROR));
mEventDispatcher.dispatchEvent(
new ImageLoadEvent(getId(), SystemClock.nanoTime(), ImageLoadEvent.ON_LOAD_END));
new ImageLoadEvent(getId(), SystemClock.elapsedRealtime(), ImageLoadEvent.ON_LOAD_END));
}
};
}
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ protected void addEventEmitters(
new ReactModalHostView.OnRequestCloseListener() {
@Override
public void onRequestClose(DialogInterface dialog) {
dispatcher.dispatchEvent(new RequestCloseEvent(view.getId(), SystemClock.nanoTime()));
dispatcher.dispatchEvent(new RequestCloseEvent(view.getId(), SystemClock.elapsedRealtime()));
}
});
view.setOnShowListener(
new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
dispatcher.dispatchEvent(new ShowEvent(view.getId(), SystemClock.nanoTime()));
dispatcher.dispatchEvent(new ShowEvent(view.getId(), SystemClock.elapsedRealtime()));
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public PickerEventEmitter(ReactPicker reactPicker, EventDispatcher eventDispatch
@Override
public void onItemSelected(int position) {
mEventDispatcher.dispatchEvent( new PickerItemSelectEvent(
mReactPicker.getId(), SystemClock.nanoTime(), position));
mReactPicker.getId(), SystemClock.elapsedRealtime(), position));
}
}
}
4 changes: 2 additions & 2 deletions ...oid/src/main/java/com/facebook/react/views/recyclerview/RecyclerViewBackedScrollView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt) {
((ReactContext) getContext()).getNativeModule(UIManagerModule.class).getEventDispatcher()
.dispatchEvent(ScrollEvent.obtain(
getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
ScrollEventType.SCROLL,
0, /* offsetX = 0, horizontal scrolling only */
calculateAbsoluteOffset(),
Expand All @@ -359,7 +359,7 @@ private void onTotalChildrenHeightChange(int newTotalChildrenHeight) {
((ReactContext) getContext()).getNativeModule(UIManagerModule.class).getEventDispatcher()
.dispatchEvent(new ContentSizeChangeEvent(
getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
getWidth(),
newTotalChildrenHeight));
}
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private static void emitScrollEvent(ViewGroup scrollView, ScrollEventType scroll
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
ScrollEvent.obtain(
scrollView.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
scrollEventType,
scrollView.getScrollX(),
scrollView.getScrollY(),
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
new ReactSliderEvent(
seekbar.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
((ReactSlider)seekbar).toRealProgress(progress),
fromUser));
}
Expand All @@ -96,7 +96,7 @@ public void onStopTrackingTouch(SeekBar seekbar) {
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
new ReactSlidingCompleteEvent(
seekbar.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
((ReactSlider)seekbar).toRealProgress(seekbar.getProgress())));
}
};
Expand Down
2 changes: 1 addition & 1 deletion ...ndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected void addEventEmitters(
@Override
public void onRefresh() {
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher()
.dispatchEvent(new RefreshEvent(view.getId(), SystemClock.nanoTime()));
.dispatchEvent(new RefreshEvent(view.getId(), SystemClock.elapsedRealtime()));
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher().dispatchEvent(
new ReactSwitchEvent(
buttonView.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
isChecked));
}
};
Expand Down
14 changes: 7 additions & 7 deletions ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
mEventDispatcher.dispatchEvent(
new ReactTextChangedEvent(
mEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
s.toString(),
(int) PixelUtil.toDIPFromPixel(contentWidth),
(int) PixelUtil.toDIPFromPixel(contentHeight),
Expand All @@ -576,7 +576,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
mEventDispatcher.dispatchEvent(
new ReactTextInputEvent(
mEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
newText,
oldText,
start,
Expand All @@ -602,17 +602,17 @@ public void onFocusChange(View v, boolean hasFocus) {
eventDispatcher.dispatchEvent(
new ReactTextInputFocusEvent(
editText.getId(),
SystemClock.nanoTime()));
SystemClock.elapsedRealtime()));
} else {
eventDispatcher.dispatchEvent(
new ReactTextInputBlurEvent(
editText.getId(),
SystemClock.nanoTime()));
SystemClock.elapsedRealtime()));

eventDispatcher.dispatchEvent(
new ReactTextInputEndEditingEvent(
editText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
editText.getText().toString()));
}
}
Expand All @@ -630,7 +630,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
eventDispatcher.dispatchEvent(
new ReactTextInputSubmitEditingEvent(
editText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
editText.getText().toString()));
}
if (actionId == EditorInfo.IME_ACTION_NEXT ||
Expand Down Expand Up @@ -667,7 +667,7 @@ public void onSelectionChanged(int start, int end) {
mEventDispatcher.dispatchEvent(
new ReactTextInputSelectionEvent(
mReactEditText.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
start,
end
)
Expand Down
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected void addEventEmitters(final ThemedReactContext reactContext, final Rea
@Override
public void onClick(View v) {
mEventDispatcher.dispatchEvent(
new ToolbarClickEvent(view.getId(), SystemClock.nanoTime(), -1));
new ToolbarClickEvent(view.getId(), SystemClock.elapsedRealtime(), -1));
}
});

Expand All @@ -142,7 +142,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
mEventDispatcher.dispatchEvent(
new ToolbarClickEvent(
view.getId(),
SystemClock.nanoTime(),
SystemClock.elapsedRealtime(),
menuItem.getOrder()));
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ private class PageChangeListener implements OnPageChangeListener {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
mEventDispatcher.dispatchEvent(
new PageScrollEvent(getId(), SystemClock.nanoTime(), position, positionOffset));
new PageScrollEvent(getId(), SystemClock.elapsedRealtime(), position, positionOffset));
}

@Override
public void onPageSelected(int position) {
if (!mIsCurrentItemFromJs) {
mEventDispatcher.dispatchEvent(
new PageSelectedEvent(getId(), SystemClock.nanoTime(), position));
new PageSelectedEvent(getId(), SystemClock.elapsedRealtime(), position));
}
}

Expand All @@ -119,7 +119,7 @@ public void onPageScrollStateChanged(int state) {
throw new IllegalStateException("Unsupported pageScrollState");
}
mEventDispatcher.dispatchEvent(
new PageScrollStateChangedEvent(getId(), SystemClock.nanoTime(), pageScrollState));
new PageScrollStateChangedEvent(getId(), SystemClock.elapsedRealtime(), pageScrollState));
}
}

Expand Down
Loading

0 comments on commit 4f5c2b4

Please sign in to comment.