| commit | 41307051416b3e027d89e72301704432bd1c5eb3 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jan 11 20:21:00 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 11 20:21:00 2017 +0000 |
| tree | 5984cdb78a310b7311cf7c3a8734bbc7b18a839e | |
| parent | 1cc1c9ad83014ec8af54a44112138339c52795b0 [diff] | |
| parent | 72dbd91a56b02a4e8ce23741c2b906963dd3d054 [diff] |
Merge "Reset initial animation values before completing reorder animation." into ub-launcher3-master
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 70c8739..da12e67 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java
@@ -2096,6 +2096,7 @@ a.cancel(); } + setInitialAnimationValues(true); a = new LauncherViewPropertyAnimator(child) .scaleX(initScale) .scaleY(initScale)