commit 36591d5ee3d15e9bc1ac9ec101ae0ae01372a9f4
author Winson Chung <winsonc@google.com> Wed Apr 25 21:32:21 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 25 21:32:21 2012 -0700
tree 5b9dbb6d59a4653fbcc9b023da891ec881eae167
parent 0617effd3b260b0603059c7dade7e50841bfb305
parent 2890151ad0f4746715d2b9ad9516c99b683f639f

am 2890151a: Merge "Remove all deferred widget pages when we cancel all tasks. (Potential fix for bug 6387680)" into jb-dev

* commit '2890151ad0f4746715d2b9ad9516c99b683f639f':
  Remove all deferred widget pages when we cancel all tasks. (Potential fix for bug 6387680)

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index bb5365e..00a35a5 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -860,6 +860,7 @@
             iter.remove();
             mDirtyPageContent.set(task.page, true);
         }
+        mDeferredSyncWidgetPageItems.clear();
     }
 
     public void setContentType(ContentType type) {