am fe2fb826: am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

* commit 'fe2fb82657d52c17c9a09fb74e140b80db634a8c':
  Revert "Fixing crash in empty folders. (Bug 11627191)"

src/com/android/launcher3/Folder.java

@@ -408,15 +408,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             mFolderName.setText("");
         }
         updateItemLocationsInDatabase();
-
-        // In case any children didn't come across during loading, clean up the folder accordingly
-        mFolderIcon.post(new Runnable() {
-            public void run() {
-                if (getItemCount() <= 1) {
-                    replaceFolderWithFinalItem();
-                }
-            }
-        });
     }
 
     /**
@@ -835,7 +826,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             View v = list.get(i);
             ItemInfo info = (ItemInfo) v.getTag();
             LauncherModel.moveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                    info.cellX, info.cellY);
+                        info.cellX, info.cellY);
         }
     }
 
@@ -1084,7 +1075,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             public void run() {
                 CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId);
 
-                View child = null;
+               View child = null;
                 // Move the item from the folder to the workspace, in the position of the folder
                 if (getItemCount() == 1) {
                     ShortcutInfo finalItem = mInfo.contents.get(0);
@@ -1114,8 +1105,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         View finalChild = getItemAt(0);
         if (finalChild != null) {
             mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);
-        } else {
-            onCompleteRunnable.run();
         }
         mDestroyed = true;
     }

src/com/android/launcher3/FolderInfo.java

@@ -16,10 +16,10 @@
 
 package com.android.launcher3;
 
-import android.content.ContentValues;
-
 import java.util.ArrayList;
 
+import android.content.ContentValues;
+
 /**
  * Represents a folder containing shortcuts or apps.
  */

src/com/android/launcher3/LauncherModel.java

@@ -584,9 +584,8 @@ public class LauncherModel extends BroadcastReceiver {
             // as in Workspace.onDrop. Here, we just add/remove them from the list of items
             // that are on the desktop, as appropriate
             ItemInfo modelItem = sBgItemsIdMap.get(itemId);
-            if (modelItem != null &&
+            if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
-                    (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP ||
+                    modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
-                     modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) {
                 switch (modelItem.itemType) {
                     case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
                     case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: