From bad24941cdc9fd6bfa17f90a72157466b7b00f68 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 18 Nov 2011 10:16:53 -0800 Subject: [PATCH] Small fix to deal with ugly widget dropping situations -> Tried some more elaborate fixes in which aspect ratio of the preview were not preserved. Given that nothing clearly always better, going with a simple fix for now. Change-Id: I3dccf95680da55cccfb6f00befe88cea4bbe0035 --- src/com/android/launcher2/Workspace.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 8ac5248b1d..ae71761e7d 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2960,7 +2960,8 @@ public class Workspace extends SmoothPagedView mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(cellLayout, loc); resetTransitionTransform(cellLayout); - float dragViewScale = r.width() / d.dragView.getMeasuredWidth(); + float dragViewScale = Math.min(r.width() / d.dragView.getMeasuredWidth(), + r.height() / d.dragView.getMeasuredHeight()); // The animation will scale the dragView about its center, so we need to center about // the final location. loc[0] -= (d.dragView.getMeasuredWidth() - cellLayoutScale * r.width()) / 2;