commit 4554ee16f122a3dbd9a8d3b828f1c8c7e7b7fe99
author Adam Cohen <adamcohen@google.com> Wed Aug 03 16:13:21 2011 -0700
committer Adam Cohen <adamcohen@google.com> Wed Aug 03 16:18:15 2011 -0700
tree aeda4f665f33ae8e8dac5c7375101bf68487a23a
parent aaf473c2bb6329b3b09ed2e19de6aae26077050c

Small code cleanup in folders, prevent crash issue 5082899

Change-Id: Iccd4a1367f895dac7925ceae7cd7934b95e81474

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 641e0f7..15a0642 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -292,13 +292,6 @@
         return mInfo;
     }
 
-    void onOpen() {
-        // When the folder opens, we need to refresh the GridView's selection by
-        // forcing a layout
-        // TODO: find out if this is still necessary
-        mContent.requestLayout();
-    }
-
     void bind(FolderInfo info) {
         mInfo = info;
         ArrayList<ShortcutInfo> children = info.contents;
@@ -849,7 +842,8 @@
 
     private void onCloseComplete() {
         DragLayer parent = (DragLayer) getParent();
-        parent.removeView(Folder.this);
+        parent.removeView(this);
+        mDragController.removeDropTarget((DropTarget) this);
         clearFocus();
 
         if (mRearrangeOnClose) {