1 files changed, 29 insertions, 7 deletions
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index 229b01991..1b75602dc 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -6,6 +6,10 @@ import android.database.MatrixCursor;
 import android.widget.ListView;
 import com.android.launcher3.list.PinnedHeaderListView;
 import com.android.launcher3.list.SettingsPinnedHeaderAdapter;
+import com.android.launcher3.settings.SettingsProvider;
+
+import java.util.ArrayList;
+import java.util.Arrays;
 
 public class OverviewSettingsPanel {
     public static final String ANDROID_SETTINGS = "com.android.settings";
@@ -35,12 +39,6 @@ public class OverviewSettingsPanel {
                 res.getString(R.string.drawer_settings),
                 res.getString(R.string.app_settings)};
 
-        String[] values = new String[]{
-                res.getString(R.string.home_screen_search_text),
-                res.getString(R.string.icon_labels),
-                res.getString(R.string.scrolling_wallpaper),
-                res.getString(R.string.grid_size_text)};
-
         String[] valuesDrawer = new String[] {
                 res.getString(R.string.icon_labels),
                 res.getString(R.string.app_drawer_style),
@@ -61,7 +59,8 @@ public class OverviewSettingsPanel {
         mSettingsAdapter.addPartition(false, true);
         mSettingsAdapter.mPinnedHeaderCount = headers.length;
 
-        mSettingsAdapter.changeCursor(HOME_SETTINGS_POSITION, createCursor(headers[0], values));
+        mSettingsAdapter.changeCursor(HOME_SETTINGS_POSITION,
+                createCursor(headers[0], getValues()));
         mSettingsAdapter.changeCursor(DRAWER_SETTINGS_POSITION, createCursor(headers[1],
                 valuesDrawer));
         mSettingsAdapter.changeCursor(APP_SETTINGS_POSITION, createCursor(headers[2], valuesApp));
@@ -77,6 +76,29 @@ public class OverviewSettingsPanel {
         return cursor;
     }
 
+    private String[] getValues() {
+        Resources res = mLauncher.getResources();
+        ArrayList<String> values = new ArrayList<String>(Arrays.asList(new String[]{
+                res.getString(R.string.home_screen_search_text),
+                res.getString(R.string.icon_labels),
+                res.getString(R.string.scrolling_wallpaper),
+                res.getString(R.string.grid_size_text)}));
+
+        // Optionally add additional value based on setting
+        boolean remoteAppsEnabled = SettingsProvider.getBoolean(mLauncher, null,
+                R.bool.preferences_interface_homescreen_remote_folder_default);
+        if (remoteAppsEnabled) {
+            String remoteAppsName = RemoteFolderManager.getFeatureTitle(res);
+            if (remoteAppsName != null) {
+                values.add(remoteAppsName);
+            }
+        }
+
+        String[] valuesArr = new String[values.size()];
+        values.toArray(valuesArr);
+        return valuesArr;
+    }
+
     public void notifyDataSetInvalidated() {
         mSettingsAdapter.notifyDataSetInvalidated();
     }