tree 5cf106d36b2bc7244519fb0901bbdd98a74c00d5
parent 3d97fdcfdf5ae39cf98b0bd7d1a5e260eecc1d9c
author Tony Wickham <twickham@google.com> 1571164515 -0700
committer Tony Wickham <twickham@google.com> 1571164515 -0700

Fix mSubtractDisplacement when recatching

Previously we correctly set mSubtractDisplacement when re-catching
during the SETTLING state, but then immediately overrode it to be
+/-mTouchSlop.

Test: Swipe up to all apps, catch it by touching down during the
transition, ensure there's no jump when starting to move again.

Change-Id: I5d543e8a8b027b68bafb26b752e70862f6ae0777