Fixing 1-point jump upon switching from DragView to drag shadow.
Upon the end if the growth animation for DragView, we hide DragView and
show the framework DND drag shadow. Rounding problems caused shifting of the
drag image by 1 pixel when the transition happened.
Bug: 22028725
Change-Id: I2a2275a6d18c1a10ceecaecf8a279c6d11d8c7d8
diff --git a/src/com/android/launcher3/DragView.java b/src/com/android/launcher3/DragView.java
index a4e7ca7..91dadf3 100644
--- a/src/com/android/launcher3/DragView.java
+++ b/src/com/android/launcher3/DragView.java
@@ -199,9 +199,11 @@
public void provideDragShadowMetrics(Point size, Point touch) {
size.set((int)(mBitmap.getWidth() * getScaleX()), (int)(mBitmap.getHeight() * getScaleY()));
- final int xGrowth = (int)(mBitmap.getWidth() * (getScaleX() - mInitialScale));
- final int yGrowth = (int)(mBitmap.getHeight() * (getScaleY() - mInitialScale));
- touch.set(mRegistrationX + xGrowth / 2, mRegistrationY + yGrowth / 2);
+ final float xGrowth = mBitmap.getWidth() * (getScaleX() - mInitialScale);
+ final float yGrowth = mBitmap.getHeight() * (getScaleY() - mInitialScale);
+ touch.set(
+ mRegistrationX + (int)Math.round(xGrowth / 2),
+ mRegistrationY + (int)Math.round(yGrowth / 2));
}
@Override
