summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/FolderIcon.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-03-18 15:56:01 -0700
committerWinson Chung <winsonc@google.com>2011-03-18 15:56:43 -0700
commit7a1d16555d80135e61b90158ff3c1e3f963bd8b8 (patch)
tree90bbb8a20bd83d38b66b37902c13dc449e188889 /src/com/android/launcher2/FolderIcon.java
parentac5f8b75ecea80d0f99702bc43b37d09dc49203a (diff)
downloadandroid_packages_apps_Trebuchet-7a1d16555d80135e61b90158ff3c1e3f963bd8b8.tar.gz
android_packages_apps_Trebuchet-7a1d16555d80135e61b90158ff3c1e3f963bd8b8.tar.bz2
android_packages_apps_Trebuchet-7a1d16555d80135e61b90158ff3c1e3f963bd8b8.zip
Fixing crash where we were assuming an old parent hierarchy.
Change-Id: I5acccab175c150f2fb994e58f0b5592d2015fcfe
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r--src/com/android/launcher2/FolderIcon.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index dd83c781a..bbc3409af 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -43,7 +43,10 @@ public class FolderIcon extends BubbleTextView implements DropTarget {
}
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,