diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-04 14:23:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 14:23:42 +0000 |
commit | d7ac23aec1420d51759fc017455f6d383198e236 (patch) | |
tree | be5c03608ce3a9ef450412328c2926c891f9ffc2 /src/com/android/launcher3/Folder.java | |
parent | 4cda5b770db7f375a4766fe6c0d657b9d5303374 (diff) | |
parent | eadbfc564d84aaf1d800da3d0d6edf6312f89648 (diff) | |
download | android_packages_apps_Trebuchet-d7ac23aec1420d51759fc017455f6d383198e236.tar.gz android_packages_apps_Trebuchet-d7ac23aec1420d51759fc017455f6d383198e236.tar.bz2 android_packages_apps_Trebuchet-d7ac23aec1420d51759fc017455f6d383198e236.zip |
Merge "Move wallpapers to external activity" into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 33d300cad..808d85d66 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1090,9 +1090,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList public void onDrop(DragObject d) { ShortcutInfo item; - if (d.dragInfo instanceof ApplicationInfo) { + if (d.dragInfo instanceof AppInfo) { // Came from all apps -- make a copy - item = ((ApplicationInfo) d.dragInfo).makeShortcut(); + item = ((AppInfo) d.dragInfo).makeShortcut(); item.spanX = 1; item.spanY = 1; } else { |