diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-19 18:02:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-19 18:02:12 +0000 |
| commit | d1cf445878369af5aaaab3ddeb1d3d0e3ca936fb (patch) | |
| tree | 260d14ffe4f32a9bdd2e7f9ddd4c0a6468b09020 | |
| parent | e92e99b8eb4903a14ea7bf330afe16f7c54534a2 (diff) | |
| parent | 25e7d67e11c1cff9911f43705b5f0ca306b89402 (diff) | |
| download | android_packages_apps_Trebuchet-d1cf445878369af5aaaab3ddeb1d3d0e3ca936fb.tar.gz android_packages_apps_Trebuchet-d1cf445878369af5aaaab3ddeb1d3d0e3ca936fb.tar.bz2 android_packages_apps_Trebuchet-d1cf445878369af5aaaab3ddeb1d3d0e3ca936fb.zip | |
Merge changes from topic "am-3e098e52-a5e6-4050-ac05-724b2c56ff1d" into ub-launcher3-master
* changes:
[automerger] Linking swipe animate to stateTransition to that it gets properly reset afterwards am: cc35bb88da
Linking swipe animate to stateTransition to that it gets properly reset afterwards
| -rw-r--r-- | quickstep/src/com/android/quickstep/ActivityControlHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index 0ea729f28..52db0017b 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -213,9 +213,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { anim.play(shiftAnim); } - // TODO: Link this animation to state animation, so that it is cancelled - // automatically on state change anim.setDuration(transitionLength * 2); + activity.getStateManager().setCurrentAnimation(anim); return AnimatorPlaybackController.wrap(anim, transitionLength * 2); } |