commit 784d3a4a92cc2d4ce975953bc02145f7ebaa9d2a
author Vadim Tryshev <vadimt@google.com> Tue Aug 11 19:25:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 11 19:25:49 2015 +0000
tree 2512ebb5ef7144b378422437a1b7bd37f399b165
parent d7d15dad7baa03aef5e0c9b000085f5487b49de6
parent 37bd006b73b4399ba10bb46e7f57a56b2e133e86

Merge "Fixing drag view transition jump for scaled-down icons." into ub-launcher3-master

src/com/android/launcher3/DragView.java

diff --git a/src/com/android/launcher3/DragView.java b/src/com/android/launcher3/DragView.java
index 91dadf3..8957735 100644
--- a/src/com/android/launcher3/DragView.java
+++ b/src/com/android/launcher3/DragView.java
@@ -199,8 +199,8 @@
     public void provideDragShadowMetrics(Point size, Point touch) {
         size.set((int)(mBitmap.getWidth() * getScaleX()), (int)(mBitmap.getHeight() * getScaleY()));
 
-        final float xGrowth = mBitmap.getWidth() * (getScaleX() - mInitialScale);
-        final float yGrowth = mBitmap.getHeight() * (getScaleY() - mInitialScale);
+        final float xGrowth = mBitmap.getWidth() * (getScaleX() - 1);
+        final float yGrowth = mBitmap.getHeight() * (getScaleY() - 1);
         touch.set(
                 mRegistrationX + (int)Math.round(xGrowth / 2),
                 mRegistrationY + (int)Math.round(yGrowth / 2));