diff options
| author | Winson Chung <winsonc@google.com> | 2011-03-18 16:08:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-18 16:08:36 -0700 |
| commit | 538c265f66ba96cdffd135ab303351b8ec1b7789 (patch) | |
| tree | 3e3ecc4095cab471420c700a5a6dec85bac525dc /src/com/android | |
| parent | f1883646e051c5d387c52563aa47c2246863ba00 (diff) | |
| parent | 7a1d16555d80135e61b90158ff3c1e3f963bd8b8 (diff) | |
| download | android_packages_apps_Trebuchet-538c265f66ba96cdffd135ab303351b8ec1b7789.tar.gz android_packages_apps_Trebuchet-538c265f66ba96cdffd135ab303351b8ec1b7789.tar.bz2 android_packages_apps_Trebuchet-538c265f66ba96cdffd135ab303351b8ec1b7789.zip | |
Merge "Fixing crash where we were assuming an old parent hierarchy."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 5 |
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, |