commit 0d38d18a6cb3bc255ce16f17ebf2fdc8b491048b
author Brandon Keely <lbk@google.com> Thu May 10 17:07:49 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 17:07:49 2012 -0700
tree 227cd33bbb05e4ba5de9158d29822f43f67b33c3
parent 8d7bd22c836c228914c4a4320407bad7c17f3eaa
parent faf22e15f18479ee84ef15869694cd581df38dc5

am faf22e15: Ensure that rearranged widgets return to translationY=0

* commit 'faf22e15f18479ee84ef15869694cd581df38dc5':
  Ensure that rearranged widgets return to translationY=0

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index ece1870..e4b5af3 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -2010,7 +2010,7 @@
                 ObjectAnimator.ofFloat(child, "scaleX", 1f),
                 ObjectAnimator.ofFloat(child, "scaleY", 1f),
                 ObjectAnimator.ofFloat(child, "translationX", 0f),
-                ObjectAnimator.ofFloat(child, "translationX", 0f)
+                ObjectAnimator.ofFloat(child, "translationY", 0f)
             );
             s.setDuration(REORDER_ANIMATION_DURATION);
             s.setInterpolator(new android.view.animation.DecelerateInterpolator(1.5f));