Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf (d65fb393) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Folder.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}
		});
		}

		/**
		@@ -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;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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.
		*/

+2 −3

Original line number	Diff line number	Diff line
		@@ -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: