From 596c0e6dbbe80f016339ad5592b1b79fdef75ad7 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Wed, 2 Jun 2010 13:29:52 -0700
Subject: Don't perform collision checks for items in folders.

Bug: 2735146
Change-Id: Ie4d03b09cc75bfc176ec91be6f6f4369af5cc2a3
---
 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 26671ad2c..d2cebc0d4 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -672,6 +672,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