summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2011-12-14 21:01:43 -0500
committernebkat <nebkat@gmail.com>2011-12-15 07:52:14 +0000
commit54436fb44f3ea661de4176ed8a8a402746f7a154 (patch)
tree2c1f1a40cc9caf0d233cfa98a54b5b1b676f38f6
parent46e86b755356241a0bac0f1319ebb78acc24302a (diff)
downloadandroid_packages_apps_Trebuchet-54436fb44f3ea661de4176ed8a8a402746f7a154.tar.gz
android_packages_apps_Trebuchet-54436fb44f3ea661de4176ed8a8a402746f7a154.tar.bz2
android_packages_apps_Trebuchet-54436fb44f3ea661de4176ed8a8a402746f7a154.zip
Workspace: Resize Widget Restriction
Only allow widget to be resized if picked/dropped in same location. Change-Id: I2a7be6749608aa8b66a164fb1472d8aa395f237f
-rw-r--r--src/com/android/launcher2/Workspace.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d967c7fe7..047b16b54 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2235,7 +2235,10 @@ public class Workspace extends SmoothPagedView
final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
AppWidgetProviderInfo pinfo = hostView.getAppWidgetInfo();
- if (pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE || mResizeAnyWidget) {
+ boolean hasMovedCells = ((mTargetCell[0] != mDragInfo.cellX) || (mTargetCell[1] != mDragInfo.cellY));
+
+ if ((pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE || mResizeAnyWidget)
+ && !hasMovedCells && !hasMovedLayouts) {
final Runnable resizeRunnable = new Runnable() {
public void run() {
DragLayer dragLayer = mLauncher.getDragLayer();