From 774b327991dc9e1c140d929c32c87dff36695bfc Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Tue, 8 Jun 2010 17:39:37 -0700
Subject: Fix the folder bug.  The change that had previously fixed this got
 reverted somehow.

Change-Id: I308656a5b1748e8aca254410b049110afaa7affc
---
 src/com/android/launcher2/LauncherModel.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index ce26f37a2..17cd15101 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -670,6 +670,10 @@ public class LauncherModel extends BroadcastReceiver {
 
             // check & update map of what's occupied; used to discard overlapping/invalid items
             private boolean checkItemPlacement(ItemInfo occupied[][][], ItemInfo item) {
+                if (item.container != LauncherSettings.Favorites.CONTAINER_DESKTOP) {
+                    return true;
+                }
+
                 for (int x = item.cellX; x < (item.cellX+item.spanX); x++) {
                     for (int y = item.cellY; y < (item.cellY+item.spanY); y++) {
                         if (occupied[item.screen][x][y] != null) {
-- 
cgit v1.2.3