From 72dbd91a56b02a4e8ce23741c2b906963dd3d054 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 4 Jan 2017 14:03:07 -0800
Subject: [PATCH] Reset initial animation values before completing reorder
 animation.

In some reorder cases, the icons would stop in a transient position.

Change-Id: I9d358e74ab403989929dee87542d3dde78c2f229
---
 src/com/android/launcher3/CellLayout.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 70c8739bee..da12e67de1 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -2096,6 +2096,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
                 a.cancel();
             }
 
+            setInitialAnimationValues(true);
             a = new LauncherViewPropertyAnimator(child)
                 .scaleX(initScale)
                 .scaleY(initScale)