From 49a9d17521e023c2700798c70a7afbb0a9a4f6d5 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 14 Sep 2022 10:09:29 +0200
Subject: [PATCH] [merge] Re-enable new Element app layout

Change-Id: Ic777c319916e7474735f8afca86d8044b64e3910
---
 .../java/im/vector/app/features/settings/VectorPreferences.kt   | 2 --
 vector/src/main/res/xml/vector_settings_labs.xml                | 2 --
 2 files changed, 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 2b28f5aff2..e25170593e 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -1416,8 +1416,6 @@ class VectorPreferences @Inject constructor(
      * Indicates whether or not new app layout is enabled.
      */
     fun isNewAppLayoutEnabled(): Boolean {
-        // SC: disabled for now (only crashes either way)
-        if (true) return false
         return vectorFeatures.isNewAppLayoutFeatureEnabled() &&
                 defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default))
     }
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 8ba9307bae..36bae73918 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -154,13 +154,11 @@
         android:summary="@string/labs_enable_element_call_permission_shortcuts_summary"
         android:title="@string/labs_enable_element_call_permission_shortcuts" />
 
-        <!--
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="@bool/settings_labs_new_app_layout_default"
         android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
         android:summary="@string/labs_enable_new_app_layout_summary"
         android:title="@string/labs_enable_new_app_layout_title" />
-        -->
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>