summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-04-12 11:30:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-12 11:30:37 -0700
commitc4a729ac9da6d1e7c4273262607773bf0f1f21d3 (patch)
tree932948449ed94f6a6b9d53d66d8ad3e004f48a77 /src/com/android/launcher2/Workspace.java
parentaea1ce51bcb218960d9a95495c3c22bc492351bf (diff)
parentbebf042666cffe52039b875a549a582abd78a431 (diff)
downloadandroid_packages_apps_Trebuchet-c4a729ac9da6d1e7c4273262607773bf0f1f21d3.tar.gz
android_packages_apps_Trebuchet-c4a729ac9da6d1e7c4273262607773bf0f1f21d3.tar.bz2
android_packages_apps_Trebuchet-c4a729ac9da6d1e7c4273262607773bf0f1f21d3.zip
Merge "Widget resizing can now displace items"
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r--src/com/android/launcher2/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 5b321f3b8..86f4611e9 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -3402,8 +3402,8 @@ public class Workspace extends SmoothPagedView
ItemInfo info = (ItemInfo) v.getTag();
// Null check required as the AllApps button doesn't have an item info
if (info != null) {
- LauncherModel.moveItemInDatabase(mLauncher, info, container, screen, info.cellX,
- info.cellY);
+ LauncherModel.modifyItemInDatabase(mLauncher, info, container, screen, info.cellX,
+ info.cellY, info.spanX, info.spanY);
}
}
}