diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-19 21:08:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-19 21:08:10 +0000 |
commit | 63aa46531ab202549f397c5370d08ca0453ccf93 (patch) | |
tree | 8a4809766fcfcda944a55c8e5f4b1ae6b9ba0b1c /src/com/android/launcher3 | |
parent | 1cd32a2144dc1a620e6a22e5a05b489ec86abb18 (diff) | |
parent | 7c3cccf427be23990d7bbc797a3106de69389586 (diff) | |
download | android_packages_apps_Trebuchet-63aa46531ab202549f397c5370d08ca0453ccf93.tar.gz android_packages_apps_Trebuchet-63aa46531ab202549f397c5370d08ca0453ccf93.tar.bz2 android_packages_apps_Trebuchet-63aa46531ab202549f397c5370d08ca0453ccf93.zip |
Merge "Fixing empty screen created at the end, even when dragging the last item on the last screen." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 61d09a95c..44d70ba79 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2319,14 +2319,14 @@ public class Workspace extends PagedView throw new IllegalStateException(msg); } - DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), - DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale, accessible); - dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor()); - if (child.getParent() instanceof ShortcutAndWidgetContainer) { mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent(); } + DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), + DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale, accessible); + dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor()); + b.recycle(); } |