Merge pull request #3053 from matrix-org/travis/bc-labs

Convert breadcrumbs from labs to real setting

src/components/structures/LeftPanel.js

@@ -54,9 +54,9 @@ const LeftPanel = React.createClass({
         this.focusedElement = null;
 
         this._settingWatchRef = SettingsStore.watchSetting(
-            "feature_room_breadcrumbs", null, this._onBreadcrumbsChanged);
+            "breadcrumbs", null, this._onBreadcrumbsChanged);
 
-        const useBreadcrumbs = SettingsStore.isFeatureEnabled("feature_room_breadcrumbs");
+        const useBreadcrumbs = !!SettingsStore.getValue("breadcrumbs");
         Analytics.setBreadcrumbs(useBreadcrumbs);
         this.setState({breadcrumbs: useBreadcrumbs});
     },

src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js

@@ -46,6 +46,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
 
     static ROOM_LIST_SETTINGS = [
         'RoomList.orderByImportance',
+        'breadcrumbs',
     ];
 
     static ADVANCED_SETTINGS = [

src/i18n/strings/en_EN.json

@@ -302,7 +302,6 @@
     "Failed to join room": "Failed to join room",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
-    "Show recent room avatars above the room list": "Show recent room avatars above the room list",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
     "Render simple counters in room header": "Render simple counters in room header",
     "Edit messages after they have been sent (refresh to apply changes)": "Edit messages after they have been sent (refresh to apply changes)",
@@ -338,6 +337,7 @@
     "Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
     "Show developer tools": "Show developer tools",
     "Order rooms in the room list by most important first instead of most recent": "Order rooms in the room list by most important first instead of most recent",
+    "Show recently visited rooms above the room list": "Show recently visited rooms above the room list",
     "Show hidden events in timeline": "Show hidden events in timeline",
     "Low bandwidth mode": "Low bandwidth mode",
     "Collecting app version information": "Collecting app version information",

src/settings/Settings.js

@@ -101,12 +101,6 @@ export const SETTINGS = {
         default: false,
         controller: new CustomStatusController(),
     },
-    "feature_room_breadcrumbs": {
-        isFeature: true,
-        displayName: _td("Show recent room avatars above the room list"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_custom_tags": {
         isFeature: true,
         displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),
@@ -369,6 +363,11 @@ export const SETTINGS = {
         displayName: _td('Order rooms in the room list by most important first instead of most recent'),
         default: true,
     },
+    "breadcrumbs": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Show recently visited rooms above the room list"),
+        default: true,
+    },
     "showHiddenEventsInTimeline": {
         displayName: _td("Show hidden events in timeline"),
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,