Revert "Fixing crash in empty folders. (Bug 11627191)"
This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb.
Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 2fb8f92..1d234ff 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -408,15 +408,6 @@
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();
- }
- }
- });
}
/**
@@ -825,7 +816,7 @@
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);
}
}
@@ -1074,7 +1065,7 @@
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);
@@ -1104,8 +1095,6 @@
View finalChild = getItemAt(0);
if (finalChild != null) {
mFolderIcon.performDestroyAnimation(finalChild, onCompleteRunnable);
- } else {
- onCompleteRunnable.run();
}
mDestroyed = true;
}