1 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 214ec3241..b66d5b70d 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -170,12 +170,19 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         icon.mLauncher = launcher;
         icon.setContentDescription(String.format(launcher.getString(R.string.folder_name_format),
                 folderInfo.title));
-        Folder folder = Folder.fromXml(launcher);
-        folder.setDragController(launcher.getDragController());
-        folder.setFolderIcon(icon);
-        folder.bind(folderInfo);
-        icon.mFolder = folder;
-
+        if (folderInfo.subType == FolderInfo.REMOTE_SUBTYPE) {
+            RemoteFolder folder = RemoteFolder.fromXml(launcher);
+            folder.setDragController(launcher.getDragController());
+            folder.setFolderIcon(icon);
+            folder.bind(folderInfo);
+            icon.mFolder = folder;
+        } else {
+            Folder folder = Folder.fromXml(launcher);
+            folder.setDragController(launcher.getDragController());
+            folder.setFolderIcon(icon);
+            folder.bind(folderInfo);
+            icon.mFolder = folder;
+        }
         icon.mFolderRingAnimator = new FolderRingAnimator(launcher, icon);
         folderInfo.addListener(icon);