4 files changed, 11 insertions, 9 deletions
diff --git a/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java b/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
index e09010d16..a79791f6d 100644
--- a/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
+++ b/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
@@ -1,5 +1,6 @@
 package com.android.launcher3;
 
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
@@ -73,4 +74,10 @@ public class RemoteFolderManager {
      */
     public void onBindViewHolder(final AppDrawerListAdapter.ViewHolder holder,
                                  final AppDrawerListAdapter.AppItemIndexedInfo indexedInfo) { }
+
+    /**
+     * Get the String to be used for the RemoteFolder name and its corresponding Settings option
+     * @return the name RemoteFolder and its Setting option should use
+     */
+    public static String getFeatureTitle(Resources res) { return null; }
 }
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 3577bb7a1..5839438f6 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -29,10 +29,6 @@
         launcher:spanX="5"
         launcher:spanY="2" />
 
-    <!-- Recommended Folder -->
-    <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">
-    </remote-folder>
-
     <!-- Google Folder -->
     <folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">
         <favorite
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 96845ae56..81a1ef701 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -29,10 +29,6 @@
         launcher:spanX="6"
         launcher:spanY="2" />
 
-    <!-- Recommended Folder -->
-    <remote-folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/recommendations_title">
-    </remote-folder>
-
     <!-- Google Folder -->
     <folder launcher:screen="1" launcher:x="0" launcher:y="4" launcher:title="@string/google_title">
         <favorite
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 6ce0d6362..92f2bd46a 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -92,7 +92,10 @@ public class OverviewSettingsPanel {
         boolean remoteAppsEnabled = SettingsProvider.getBoolean(mLauncher, null,
                 R.bool.preferences_interface_homescreen_remote_folder_default);
         if (remoteAppsEnabled) {
-            values.add(res.getString(R.string.recommendations_title));
+            String remoteAppsName = RemoteFolderManager.getFeatureTitle(res);
+            if (remoteAppsName != null) {
+                values.add(remoteAppsName);
+            }
         }
 
         String[] valuesArr = new String[values.size()];