diff options
author | Winson Chung <winsonc@google.com> | 2013-11-13 15:47:05 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:14 -0700 |
commit | 57529fe246212966da65700afa20fc135c2bbc88 (patch) | |
tree | caaf2a37ed7296388c725691490bdd0b1a2d625d /src/com/android/launcher3/Workspace.java | |
parent | 32f1110ae23676000fa3ef59df8b03213a2ece6a (diff) | |
download | android_packages_apps_Trebuchet-57529fe246212966da65700afa20fc135c2bbc88.tar.gz android_packages_apps_Trebuchet-57529fe246212966da65700afa20fc135c2bbc88.tar.bz2 android_packages_apps_Trebuchet-57529fe246212966da65700afa20fc135c2bbc88.zip |
Use the icon bounds for all calculations.
- Fixes a drag and drop issue when the dynamic
grid scales icons down, due to the drawable bounds
not being equal to their bitmap sizes.
Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 7d83fde2a..2459aecda 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2704,8 +2704,9 @@ public class Workspace extends SmoothPagedView throw new IllegalStateException(msg); } - mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), + DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale); + dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor()); if (child.getParent() instanceof ShortcutAndWidgetContainer) { mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent(); @@ -4302,6 +4303,11 @@ public class Workspace extends SmoothPagedView } @Override + public float getIntrinsicIconScaleFactor() { + return 1f; + } + + @Override public boolean supportsFlingToDelete() { return true; } |