diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-06-02 22:41:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 22:41:39 -0700 |
| commit | 718a0a382ca96988369a4d22798aa692e71538cb (patch) | |
| tree | aa2a1c0aebe1171eff5650971b267f7e48ded0f4 /src | |
| parent | 98994c4a83e86e2444eb928a9bd3392f1f31f0cd (diff) | |
| parent | 596c0e6dbbe80f016339ad5592b1b79fdef75ad7 (diff) | |
| download | android_packages_apps_Trebuchet-718a0a382ca96988369a4d22798aa692e71538cb.tar.gz android_packages_apps_Trebuchet-718a0a382ca96988369a4d22798aa692e71538cb.tar.bz2 android_packages_apps_Trebuchet-718a0a382ca96988369a4d22798aa692e71538cb.zip | |
am 596c0e6d: Don\'t perform collision checks for items in folders.
Diffstat (limited to 'src')
| -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 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) { |