From 660a25f21d965e9728034920d2693ba7a8686190 Mon Sep 17 00:00:00 2001
From: goapunk <noobie@goapunks.net>
Date: Mon, 3 Jul 2017 09:27:07 +0200
Subject: [PATCH] Split notification settings into title and summary.

Signed-off-by: goapunk <noobie@goapunks.net>
---
 briar-android/src/main/res/values/strings.xml | 12 ++++++++----
 briar-android/src/main/res/xml/settings.xml   | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 42d6ba9f2..a336224ee 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -340,10 +340,14 @@
 
 	<!-- Settings Notifications -->
 	<string name="notification_settings_title">Notifications</string>
-	<string name="notify_private_messages_setting">Show alerts for private messages</string>
-	<string name="notify_group_messages_setting">Show alerts for group messages</string>
-	<string name="notify_forum_posts_setting">Show alerts for forum posts</string>
-	<string name="notify_blog_posts_setting">Show alerts for blog posts</string>
+	<string name="notify_private_messages_setting_title">Private messages</string>
+	<string name="notify_private_messages_setting_summary">Show alerts for private messages</string>
+	<string name="notify_group_messages_setting_title">Group messages</string>
+	<string name="notify_group_messages_setting_summary">Show alerts for group messages</string>
+	<string name="notify_forum_posts_setting_title">Forum posts</string>
+	<string name="notify_forum_posts_setting_summary">Show alerts for forum posts</string>
+	<string name="notify_blog_posts_setting_title">Blog posts</string>
+	<string name="notify_blog_posts_setting_summary">Show alerts for blog posts</string>
 	<string name="notify_vibration_setting">Vibrate</string>
 	<string name="notify_sound_setting">Sound</string>
 	<string name="notify_sound_setting_default">Default ringtone</string>
diff --git a/briar-android/src/main/res/xml/settings.xml b/briar-android/src/main/res/xml/settings.xml
index 26f8aa461..07d47137b 100644
--- a/briar-android/src/main/res/xml/settings.xml
+++ b/briar-android/src/main/res/xml/settings.xml
@@ -61,25 +61,29 @@
 			android:defaultValue="true"
 			android:key="pref_key_notify_private_messages"
 			android:persistent="false"
-			android:title="@string/notify_private_messages_setting"/>
+			android:title="@string/notify_private_messages_setting_title"
+			android:summary="@string/notify_private_messages_setting_summary"/>
 
 		<CheckBoxPreference
 			android:defaultValue="true"
 			android:key="pref_key_notify_group_messages"
 			android:persistent="false"
-			android:title="@string/notify_group_messages_setting"/>
+			android:title="@string/notify_group_messages_setting_title"
+			android:summary="@string/notify_group_messages_setting_summary"/>
 
 		<CheckBoxPreference
 			android:defaultValue="true"
 			android:key="pref_key_notify_forum_posts"
 			android:persistent="false"
-			android:title="@string/notify_forum_posts_setting"/>
+			android:title="@string/notify_forum_posts_setting_title"
+			android:summary="@string/notify_forum_posts_setting_summary"/>
 
 		<CheckBoxPreference
 			android:defaultValue="true"
 			android:key="pref_key_notify_blog_posts"
 			android:persistent="false"
-			android:title="@string/notify_blog_posts_setting"/>
+			android:title="@string/notify_blog_posts_setting_title"
+			android:summary="@string/notify_blog_posts_setting_summary"/>
 
 		<CheckBoxPreference
 			android:defaultValue="true"