[automerger] Update displacement on ACTION_UP as well, in case ACTION_UP and came in a different frame than last ACTION_MOVE am: ab66067def am: 6d75448fdb

Change-Id: I2d394c09dbe4c1e1a1d782278f8ab776f101eb36
This commit is contained in:
Android Build Merger (Role)
2018-05-29 22:55:08 +00:00
@@ -185,7 +185,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
case ACTION_UP: {
TraceHelper.endSection("TouchInt");
finishTouchTracking();
finishTouchTracking(ev);
break;
}
}
@@ -268,8 +268,10 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
* Called when the gesture has ended. Does not correlate to the completion of the interaction as
* the animation can still be running.
*/
private void finishTouchTracking() {
private void finishTouchTracking(MotionEvent ev) {
if (mPassedInitialSlop && mInteractionHandler != null) {
mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement);
mVelocityTracker.computeCurrentVelocity(1000,
ViewConfiguration.get(this).getScaledMaximumFlingVelocity());