Add remote folder if it is not already present after OOBE, and enable toggle

	in settings to hide remote folder if unwanted.

Refactor RemoteFolderUpdater to hold static instance of itself.

Refactor FolderInfo to use method for determining remote folder status, instead
	of manually comparing subType flag.

Switch back from temp-coordinates after workspace drag/drop is completed.

Remove disable button from remote folder UI.

Patch 2: Pull remote folder code out of Launcher and into RemoteFolderManager.

Patch 3: Remote @author from RemoteFolderManager

Patch 4:
	1. Remove delete button from folder.
	2. Fix NPE when screens are full. Create a new screen and ad at (0,0).
	3. Set default preference to false.
	4. Clean up leftover imports and unnecessary conditionals.
	5. Refactor Launcher.addFolder() method signature.

Patch 5: Add missing parenthesis.

Change-Id: I36b7a53175a568c5ebdc908d0256d9128e1bee65
issue-id: CYNGNOS-1378
issue-id: CYNGNOS-1331

1 files changed, 3 insertions, 20 deletions

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 3a0428557..365396b16 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2393,7 +2393,7 @@ public class LauncherModel extends BroadcastReceiver
                                 sBgItemsIdMap.put(folderInfo.id, folderInfo);
                                 sBgFolders.put(folderInfo.id, folderInfo);
 
-                                if (folderInfo.subType == FolderInfo.REMOTE_SUBTYPE) {
+                                if (folderInfo.isRemote()) {
                                     syncRemoteFolder(folderInfo, mContext);
                                 }
 
@@ -2872,7 +2872,7 @@ public class LauncherModel extends BroadcastReceiver
                             }
                             workspaceItems.remove(i);
                             folders.remove(Long.valueOf(item.id));
-                        } else if (folder.contents.size() == 0 && folder.subType == 0) {
+                        } else if (folder.contents.size() == 0 && !folder.isRemote()) {
                             LauncherModel.deleteFolderContentsFromDatabase(mContext, folder);
                             workspaceItems.remove(i);
                             folders.remove(Long.valueOf(item.id));
@@ -4259,25 +4259,8 @@ public class LauncherModel extends BroadcastReceiver
         return mCallbacks != null ? mCallbacks.get() : null;
     }
 
-    public static RemoteFolderUpdater getRemoteFolderUpdaterInstance() {
-        if (remoteFolderUpdater == null) {
-            remoteFolderUpdater = new RemoteFolderUpdater();
-        }
-        return remoteFolderUpdater;
-    }
-
     protected synchronized void syncRemoteFolder(final FolderInfo folderInfo, final Context context) {
-
-        String spKey = LauncherAppState.getSharedPreferencesKey();
-        SharedPreferences sp = context.getSharedPreferences(spKey, Context.MODE_PRIVATE);
-        boolean isEnabled = sp.getBoolean(RemoteFolder.REMOTE_FOLDER_ENABLED, true);
-
-        if (!isEnabled) {
-            Log.e(TAG, "Prevented remote folder sync, since it has been explicitly disabled.");
-            return;
-        }
-
-        RemoteFolderUpdater updater = getRemoteFolderUpdaterInstance();
+        RemoteFolderUpdater updater = RemoteFolderUpdater.getInstance();
         final int count = 6;
 
         updater.requestSync(context, count, new RemoteFolderUpdater.RemoteFolderUpdateListener() {