summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-10-20 17:08:24 -0700
committerMichael Jurka <mikejurka@google.com>2010-10-21 11:30:28 -0700
commitf3ca3ab6958b104cbf2c2fa04add97d372a94d1c (patch)
tree8287909c516f812f0e9339364102cae95776f2a2 /src/com/android/launcher2/Launcher.java
parent89308226981b9ff95d779e73a5d6140eca1d2fd9 (diff)
downloadandroid_packages_apps_Trebuchet-f3ca3ab6958b104cbf2c2fa04add97d372a94d1c.tar.gz
android_packages_apps_Trebuchet-f3ca3ab6958b104cbf2c2fa04add97d372a94d1c.tar.bz2
android_packages_apps_Trebuchet-f3ca3ab6958b104cbf2c2fa04add97d372a94d1c.zip
Fix bug that allowed multiple items in one cell
Fixed issue where opening a folder allowed items to be placed on any cell, even if it was occupied. Bug: 3094164 Change-Id: I392e7236f9cd7ea0b09f36e249d2a57c9934dc8e
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2688e54a3..471cb3ee8 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1696,7 +1696,8 @@ public final class Launcher extends Activity
folder.getInfo().opened = false;
ViewGroup parent = (ViewGroup) folder.getParent();
if (parent != null) {
- parent.removeView(folder);
+ CellLayout cl = (CellLayout) parent;
+ cl.removeViewWithoutMarkingCells(folder);
if (folder instanceof DropTarget) {
// Live folders aren't DropTargets.
mDragController.removeDropTarget((DropTarget)folder);