From 9ce541cc31b835bd8904107fcd12ffd8d4ffd534 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 4 Feb 2021 10:30:59 -0300
Subject: [PATCH] Allow settings titles on more than a single line

---
 .../src/main/res/xml/settings_connections.xml  | 15 ++++++++++-----
 .../main/res/xml/settings_notifications.xml    | 18 ++++++++++++------
 .../src/main/res/xml/settings_security.xml     |  3 ++-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/briar-android/src/main/res/xml/settings_connections.xml b/briar-android/src/main/res/xml/settings_connections.xml
index 0ef427868..2a25f7e40 100644
--- a/briar-android/src/main/res/xml/settings_connections.xml
+++ b/briar-android/src/main/res/xml/settings_connections.xml
@@ -8,7 +8,8 @@
 		android:key="pref_key_bluetooth"
 		android:persistent="false"
 		android:title="@string/bluetooth_setting"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
@@ -16,7 +17,8 @@
 		android:key="pref_key_wifi"
 		android:persistent="false"
 		android:title="@string/wifi_setting"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -25,7 +27,8 @@
 		android:persistent="false"
 		android:summary="@string/tor_enable_summary"
 		android:title="@string/tor_enable_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<ListPreference
 		android:defaultValue="0"
@@ -46,7 +49,8 @@
 		android:key="pref_key_tor_mobile_data"
 		android:persistent="false"
 		android:title="@string/tor_mobile_data_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
@@ -56,6 +60,7 @@
 		android:persistent="false"
 		android:summary="@string/tor_only_when_charging_summary"
 		android:title="@string/tor_only_when_charging_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 </PreferenceScreen>
diff --git a/briar-android/src/main/res/xml/settings_notifications.xml b/briar-android/src/main/res/xml/settings_notifications.xml
index 9e36183f7..fede5dd56 100644
--- a/briar-android/src/main/res/xml/settings_notifications.xml
+++ b/briar-android/src/main/res/xml/settings_notifications.xml
@@ -7,7 +7,8 @@
 		android:key="pref_key_notify_sign_in"
 		android:summary="@string/notify_sign_in_summary"
 		android:title="@string/notify_sign_in_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -16,7 +17,8 @@
 		android:persistent="false"
 		android:summary="@string/notify_private_messages_setting_summary"
 		android:title="@string/notify_private_messages_setting_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -25,7 +27,8 @@
 		android:persistent="false"
 		android:summary="@string/notify_group_messages_setting_summary"
 		android:title="@string/notify_group_messages_setting_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -34,7 +37,8 @@
 		android:persistent="false"
 		android:summary="@string/notify_forum_posts_setting_summary"
 		android:title="@string/notify_forum_posts_setting_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -43,7 +47,8 @@
 		android:persistent="false"
 		android:summary="@string/notify_blog_posts_setting_summary"
 		android:title="@string/notify_blog_posts_setting_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<SwitchPreferenceCompat
 		android:defaultValue="true"
@@ -51,7 +56,8 @@
 		android:key="notifyVibration"
 		android:persistent="false"
 		android:title="@string/notify_vibration_setting"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<Preference
 		android:key="notifySound"
diff --git a/briar-android/src/main/res/xml/settings_security.xml b/briar-android/src/main/res/xml/settings_security.xml
index 568efc714..8c0c3fa0c 100644
--- a/briar-android/src/main/res/xml/settings_security.xml
+++ b/briar-android/src/main/res/xml/settings_security.xml
@@ -9,7 +9,8 @@
 		android:persistent="false"
 		android:summary="@string/pref_lock_summary"
 		android:title="@string/pref_lock_title"
-		app:iconSpaceReserved="false" />
+		app:iconSpaceReserved="false"
+		app:singleLineTitle="false" />
 
 	<ListPreference
 		android:defaultValue="@string/pref_lock_timeout_value_default"