commit 6662645a670b3197fb99df202a4650b946b867be
author Daniel Sandler <dsandler@android.com> Thu Jun 03 14:12:11 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 03 14:12:11 2010 -0700
tree 09ec952bbfe8de97b01efadf5cfde31b472e8a1f
parent 596c0e6dbbe80f016339ad5592b1b79fdef75ad7
parent 86b40541a8f48287fed0663f1e6ac10610523d32

Merge "Make 2D All Apps work better in landscape and on hdpi." into froyo

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 26671ad..d2cebc0 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -672,6 +672,10 @@
 
             // 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) {