From 72b520c956a4bf11f6dbbac7eb5e18001b7a11cb Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 10 Dec 2013 01:17:03 +0000 Subject: Revert "Fixing crash in empty folders. (Bug 11627191)" This reverts commit 68b667848ef7c6f69b24a40d780e4088a5f2a1fb. Change-Id: I51da495d6f8ef98b268c23cce02cce5ef1c7ea00 --- src/com/android/launcher3/Folder.java | 15 ++------------- src/com/android/launcher3/FolderInfo.java | 4 ++-- src/com/android/launcher3/LauncherModel.java | 5 ++--- 3 files changed, 6 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 2fb8f9256..1d234ff8a 100644 --- a/src/com/android/launcher3/Folder.java +++ b/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(); - } - } - }); } /** @@ -825,7 +816,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); } } @@ -1074,7 +1065,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); @@ -1104,8 +1095,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; } diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java index d45e4e47b..bb5ae8200 100644 --- a/src/com/android/launcher3/FolderInfo.java +++ b/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. */ diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index a69617ac7..74f28b304 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/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 && - (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP || - modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT)) { + if (modelItem.container == LauncherSettings.Favorites.CONTAINER_DESKTOP || + modelItem.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { switch (modelItem.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: -- cgit v1.2.3