am 6a1d057b: am 3c2f7e10: fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen

Merge commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a' into eclair-mr2-plus-aosp

* commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a':
  fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen

src/com/android/launcher2/Launcher.java

@@ -1780,6 +1780,7 @@ public final class Launcher extends Activity
         final Workspace workspace = mWorkspace;
         int count = workspace.getChildCount();
         for (int i = 0; i < count; i++) {
+            // Use removeAllViewsInLayout() to avoid an extra requestLayout() and invalidate().
             ((ViewGroup) workspace.getChildAt(i)).removeAllViewsInLayout();
         }
 

src/com/android/launcher2/LauncherModel.java

@@ -603,6 +603,8 @@ public class LauncherModel extends BroadcastReceiver {
                 }
                 */
 
+                mItems.clear();
+
                 final Cursor c = contentResolver.query(
                         LauncherSettings.Favorites.CONTENT_URI, null, null, null, null);