summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-06-02 13:29:52 -0700
committerDaniel Sandler <dsandler@android.com>2010-06-02 13:34:01 -0700
commit596c0e6dbbe80f016339ad5592b1b79fdef75ad7 (patch)
treec93564809f785b52c6439dd57c30822d25fd0503 /src
parent8802e960495e61803c18ea3dda2e30ef0a611d8f (diff)
downloadandroid_packages_apps_Trebuchet-596c0e6dbbe80f016339ad5592b1b79fdef75ad7.tar.gz
android_packages_apps_Trebuchet-596c0e6dbbe80f016339ad5592b1b79fdef75ad7.tar.bz2
android_packages_apps_Trebuchet-596c0e6dbbe80f016339ad5592b1b79fdef75ad7.zip
Don't perform collision checks for items in folders.
Bug: 2735146 Change-Id: Ie4d03b09cc75bfc176ec91be6f6f4369af5cc2a3
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/LauncherModel.java4
1 files changed, 4 insertions, 0 deletions
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) {