From 41a12d225a546b0a193628a4e5dd6b62cc60b7d0 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Sat, 31 Oct 2009 18:30:00 -0400 Subject: [PATCH] When closing a folder, make sure to remove it from the list of drop targets. This fixes the following bugs: 2222908 2208857 --- src/com/android/launcher2/Launcher.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 6fb8e4c962..533222d104 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -202,6 +202,7 @@ public final class Launcher extends Activity super.onCreate(savedInstanceState); mModel = ((LauncherApplication)getApplication()).setLauncher(this); + mDragController = new DragController(this); mInflater = getLayoutInflater(); mAppWidgetManager = AppWidgetManager.getInstance(this); @@ -523,7 +524,6 @@ public final class Launcher extends Activity * Finds all the views we need and configure them properly. */ private void setupViews() { - mDragController = new DragController(this); DragController dragController = mDragController; DragLayer dragLayer = (DragLayer) findViewById(R.id.drag_layer); @@ -1318,8 +1318,7 @@ public final class Launcher extends Activity ViewGroup parent = (ViewGroup) folder.getParent(); if (parent != null) { parent.removeView(folder); - // TODO: this line crashes. - //mDragController.removeDropTarget((DropTarget)folder); + mDragController.removeDropTarget((DropTarget)folder); } folder.onClose(); }