1 files changed, 17 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index bada6ba13..b734ad032 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -125,6 +125,7 @@ import com.android.launcher3.PagedView.TransitionEffect;
 import com.android.launcher3.settings.SettingsProvider;
 import com.android.launcher3.stats.LauncherStats;
 import com.android.launcher3.stats.internal.service.AggregationIntentService;
+import com.cyngn.RemoteFolder.RemoteFolderUpdater;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -403,6 +404,9 @@ public class Launcher extends Activity
 
     private BubbleTextView mWaitingForResume;
 
+    // Remote Folder Updater, used in Workspace and Folder
+    private RemoteFolderUpdater remoteFolderUpdater;
+
     // Search widget
     int mSearchWidgetId;
     AppWidgetProviderInfo mSearchWidgetInfo;
@@ -3225,6 +3229,10 @@ public class Launcher extends Activity
             closeFolder();
             // Open the requested folder
             openFolder(folderIcon, folderTouchXYOffset);
+
+            if (info.subType == FolderInfo.REMOTE_SUBTYPE) {
+                mModel.syncRemoteFolder(info, this);
+            }
         } else {
             // Find the open folder...
             int folderScreen;
@@ -4883,7 +4891,7 @@ public class Launcher extends Activity
         final AnimatorSet anim = LauncherAnimUtils.createAnimatorSet();
         final Collection<Animator> bounceAnims = new ArrayList<Animator>();
         final boolean animateIcons = forceAnimateIcons && canRunNewAppsAnimation();
-        Workspace workspace = mWorkspace;
+        final Workspace workspace = mWorkspace;
         long newShortcutsScreenId = -1;
         for (int i = start; i < end; i++) {
             final ItemInfo item = shortcuts.get(i);
@@ -4934,7 +4942,7 @@ public class Launcher extends Activity
                     }
                     break;
                 case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
-                    FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this,
+                    final FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this,
                             (ViewGroup) workspace.getChildAt(workspace.getCurrentPage()),
                             (FolderInfo) item, mIconCache);
                     newFolder.setTextVisible(!mHideIconLabels);
@@ -5938,6 +5946,13 @@ public class Launcher extends Activity
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH,
                 R.bool.preferences_interface_homescreen_search_default);
     }
+
+    public RemoteFolderUpdater getRemoteFolderUpdaterInstance() {
+        if (remoteFolderUpdater == null) {
+            remoteFolderUpdater = new RemoteFolderUpdater();
+        }
+        return remoteFolderUpdater;
+    }
 }
 
 interface LauncherTransitionable {