From 5c276966f43b6979e3032f5feeed3ad22ad7f840 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 14 Sep 2022 10:17:44 +0200
Subject: [PATCH] [merge] Fix new layout crash

Change-Id: I662d6e394db1fb95181e7aa25ed82045495d8b41
---
 .../src/main/res/values/strings_sc.xml        |  1 +
 vector/src/main/res/menu/menu_new_home.xml    | 32 +++++++++++++++++++
 .../src/main/res/xml/vector_settings_labs.xml |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values/strings_sc.xml b/library/ui-strings/src/main/res/values/strings_sc.xml
index c4afadd9b6..5d973d59b3 100644
--- a/library/ui-strings/src/main/res/values/strings_sc.xml
+++ b/library/ui-strings/src/main/res/values/strings_sc.xml
@@ -198,4 +198,5 @@
     <string name="settings_follow_system_locale">Follow system language</string>
     <string name="settings_follow_system_locale_summary">When changing the system language, also change the app\'s language</string>
 
+    <string name="labs_enable_new_app_layout_summary_sc">Element\'s new simplified layout with optional tabs</string>
 </resources>
diff --git a/vector/src/main/res/menu/menu_new_home.xml b/vector/src/main/res/menu/menu_new_home.xml
index 6cd52e5608..d6e9bc709b 100644
--- a/vector/src/main/res/menu/menu_new_home.xml
+++ b/vector/src/main/res/menu/menu_new_home.xml
@@ -43,4 +43,36 @@
         app:iconTint="?vctr_content_secondary"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/dev_theming"
+        android:title="@string/settings_theme"
+        android:visible="false"
+        tools:visible="true"
+        app:showAsAction="never">
+        <menu>
+            <group>
+                <item
+                    android:id="@+id/dev_base_theme"
+                    android:title="@string/settings_theme">
+                    <!-- Programmatically inflated menu -->
+                    <menu>
+                        <group
+                            android:id="@+id/dev_base_theme_group"
+                            android:checkableBehavior="single" />
+                    </menu>
+                </item>
+                <item
+                    android:id="@+id/dev_theme_accent"
+                    android:title="@string/setting_sc_accent_color">
+                    <!-- Programmatically inflated menu -->
+                    <menu>
+                        <group
+                            android:id="@+id/dev_theme_accent_group"
+                            android:checkableBehavior="single" />
+                    </menu>
+                </item>
+            </group>
+        </menu>
+    </item>
+
 </menu>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 36bae73918..15cd79ab93 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -157,7 +157,7 @@
     <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:summary="@string/labs_enable_new_app_layout_summary_sc"
         android:title="@string/labs_enable_new_app_layout_title" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>