commit 26976d9b53161f80faf822d482ac771b8621cf31
author Adam Cohen <adamcohen@google.com> Tue Mar 22 15:33:33 2011 -0700
committer Adam Cohen <adamcohen@google.com> Tue Mar 22 15:35:27 2011 -0700
tree 8eeb03a27fd88947c721fb853457b0c019b41b27
parent 3fb17bb2326c1ee60dec7d3ae3c4c06f11716c3c

Fix resize frame bug: 4121297

Change-Id: I797c9af3ed0a0c99407c301e68d20485e108980c

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 1da08cd..9a0b79c 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -289,6 +289,10 @@
         mIsPageMoving = false;
     }
 
+    protected boolean isPageMoving() {
+        return mIsPageMoving;
+    }
+
     // a method that subclasses can override to add behavior
     protected void onPageBeginMoving() {
     }

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 2e202f7..6b68c5a 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -213,6 +213,7 @@
     WallpaperOffsetInterpolator mWallpaperOffset;
     boolean mUpdateWallpaperOffsetImmediately = false;
     boolean mSyncWallpaperOffsetWithScroll = true;
+    private Runnable mDelayedResizeRunnable;
 
     // info about the last drag
     private DragView mLastDragView;
@@ -645,6 +646,11 @@
         }
         mOverScrollMaxBackgroundAlpha = 0.0f;
         mOverScrollPageIndex = -1;
+
+        if (mDelayedResizeRunnable != null) {
+            mDelayedResizeRunnable.run();
+            mDelayedResizeRunnable = null;
+        }
     }
 
     @Override
@@ -2366,13 +2372,22 @@
                         final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
                         AppWidgetProviderInfo pinfo = hostView.getAppWidgetInfo();
                         if (pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
-                            post(new Runnable() {
+                            final Runnable resizeRunnable = new Runnable() {
                                 public void run() {
                                     DragLayer dragLayer = (DragLayer)
                                             mLauncher.findViewById(R.id.drag_layer);
                                     dragLayer.addResizeFrame(info, hostView,
                                             cellLayout);
                                 }
+                            };
+                            post(new Runnable() {
+                                public void run() {
+                                    if (!isPageMoving()) {
+                                        resizeRunnable.run();
+                                    } else {
+                                        mDelayedResizeRunnable = resizeRunnable;
+                                    }
+                                }
                             });
                         }
                     }