From 158026985772709cfcc5d93468bc9691cff2ff84 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 21 Jan 2022 16:01:54 +0100
Subject: [PATCH] Bubbles: move settings to timeline section

---
 vector/src/main/res/values/strings.xml                 |  2 +-
 .../src/main/res/xml/vector_settings_preferences.xml   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 2e476f65d2..06c3b7f41e 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3705,7 +3705,7 @@
     <string name="delete_poll_dialog_title">Remove poll</string>
     <string name="delete_poll_dialog_content">Are you sure you want to remove this poll? You won\'t be able to recover it once removed.</string>
 
-    <string name="message_bubbles">Message bubbles</string>
+    <string name="message_bubbles">Show Message bubbles</string>
 
     <string name="tooltip_attachment_photo">Open camera</string>
     <string name="tooltip_attachment_gallery">Send images and videos</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index a25562e3d2..080a0a6bc2 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -22,11 +22,6 @@
             android:title="@string/settings_theme"
             app:iconSpaceReserved="false" />
 
-        <im.vector.app.core.preference.VectorSwitchPreference
-            android:defaultValue="false"
-            android:key="SETTINGS_INTERFACE_BUBBLE_KEY"
-            android:title="@string/message_bubbles" />
-
         <im.vector.app.core.preference.VectorPreference
             android:dialogTitle="@string/font_size"
             android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
@@ -81,6 +76,11 @@
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_INTERFACE_BUBBLE_KEY"
+            android:title="@string/message_bubbles" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"