diff options
| author | The Android Automerger <android-build@android.com> | 2010-06-08 17:57:43 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2010-06-08 17:57:43 -0700 |
| commit | 90659cda7f173021ad05ecca8b32b934073c0509 (patch) | |
| tree | acc18ae1c24cc811fcf6c1085e1147aef0cab022 | |
| parent | d10c87bcd27605bf3f4677bdbcdb0b5cbd3ce9e3 (diff) | |
| parent | 774b327991dc9e1c140d929c32c87dff36695bfc (diff) | |
| download | android_packages_apps_Trebuchet-90659cda7f173021ad05ecca8b32b934073c0509.tar.gz android_packages_apps_Trebuchet-90659cda7f173021ad05ecca8b32b934073c0509.tar.bz2 android_packages_apps_Trebuchet-90659cda7f173021ad05ecca8b32b934073c0509.zip | |
Merge branch 'froyo' into froyo-release
| -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) { |