commit 538c265f66ba96cdffd135ab303351b8ec1b7789
author Winson Chung <winsonc@google.com> Fri Mar 18 16:08:36 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 16:08:36 2011 -0700
tree 3e3ecc4095cab471420c700a5a6dec85bac525dc
parent f1883646e051c5d387c52563aa47c2246863ba00
parent 7a1d16555d80135e61b90158ff3c1e3f963bd8b8

Merge "Fixing crash where we were assuming an old parent hierarchy."

src/com/android/launcher2/FolderIcon.java

diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index dd83c78..bbc3409 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -43,7 +43,10 @@
     }
 
     public boolean isDropEnabled() {
-        return !((Workspace)getParent().getParent()).isSmall();
+        final ViewGroup cellLayoutChildren = (ViewGroup) getParent();
+        final ViewGroup cellLayout = (ViewGroup) cellLayoutChildren.getParent();
+        final Workspace workspace = (Workspace) cellLayout.getParent();
+        return !workspace.isSmall();
     }
 
     static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group,