diff options
| author | Joe Onorato <joeo@android.com> | 2010-06-08 17:48:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-08 17:48:45 -0700 |
| commit | ca8c8e72480061fdbe8743e892af3df6a84f6b7d (patch) | |
| tree | 3ea8058b16a6670d8b50765f173247ca9f8605fd | |
| parent | 78f51daa71272bc7ec65754b78af470d4efc0117 (diff) | |
| parent | 774b327991dc9e1c140d929c32c87dff36695bfc (diff) | |
| download | android_packages_apps_Trebuchet-ca8c8e72480061fdbe8743e892af3df6a84f6b7d.tar.gz android_packages_apps_Trebuchet-ca8c8e72480061fdbe8743e892af3df6a84f6b7d.tar.bz2 android_packages_apps_Trebuchet-ca8c8e72480061fdbe8743e892af3df6a84f6b7d.zip | |
am 774b3279: Fix the folder bug. The change that had previously fixed this got reverted somehow.
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 4 |
1 files changed, 4 insertions, 0 deletions
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) { |