| commit | c2ef02ee15fffe4167be7c7c330b0147fff8b4ab | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Mon Feb 12 16:01:51 2018 -0800 |
| committer | Winson Chung <winsonc@google.com> | Tue Feb 13 16:31:31 2018 -0800 |
| tree | 17f45a398a58a2b46899e4fa0e64a08b169d2d5f | |
| parent | aefd062125cb49e98c412e1988845366959899b7 [diff] |
Cancel the animation when cleaning up the touch tracking Bug: 72953248 Test: Add artificial delay and launch home from home button Change-Id: I3f864ff4e0a90a4c62dbf5fe123bb3e2257c06fa
diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 74d3cba..f508eab 100644 --- a/quickstep/libs/sysui_shared.jar +++ b/quickstep/libs/sysui_shared.jar Binary files differ
diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java index d8f7aaf..80584c8 100644 --- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java +++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -331,6 +331,10 @@ // Since we start touch tracking on DOWN, we may reach this state without actually // starting the gesture. In that case, just cleanup immediately. reset(); + + // Also clean up in case the system has handled the UP and canceled the animation before + // we had a chance to start the recents animation. In such a case, we will not receive + ActivityManagerWrapper.getInstance().cancelRecentsAnimation(); } mVelocityTracker.recycle(); mVelocityTracker = null;