De-labs Message Bubbles layout (#7612)

src/settings/Settings.tsx

@@ -39,7 +39,6 @@ import { OrderedMultiController } from "./controllers/OrderedMultiController";
 import { Layout } from "./enums/Layout";
 import ReducedMotionController from './controllers/ReducedMotionController';
 import IncompatibleController from "./controllers/IncompatibleController";
-import NewLayoutSwitcherController from './controllers/NewLayoutSwitcherController';
 import { ImageSize } from "./enums/ImageSize";
 import { MetaSpace } from "../stores/spaces";
 
@@ -333,14 +332,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "feature_new_layout_switcher": {
-        isFeature: true,
-        labsGroup: LabGroup.Messaging,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("New layout switcher (with message bubbles)"),
-        default: false,
-        controller: new NewLayoutSwitcherController(),
-    },
     "feature_spaces_metaspaces": {
         isFeature: true,
         labsGroup: LabGroup.Spaces,

src/settings/controllers/NewLayoutSwitcherController.ts

@@ -1,26 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import SettingController from "./SettingController";
-import { SettingLevel } from "../SettingLevel";
-import SettingsStore from "../SettingsStore";
-import { Layout } from "../enums/Layout";
-
-export default class NewLayoutSwitcherController extends SettingController {
-    public onChange(level: SettingLevel, roomId: string, newValue: any) {
-        // On disabling switch back to Layout.Group if Layout.Bubble
-        if (!newValue && SettingsStore.getValue("layout") == Layout.Bubble) {
-            SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Group);
-        }
-    }
-}