Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '970_settings_use_summaries' into 'master'

Browse Source 
Split notification settings into title and summary.

Closes #970

See merge request !554
This commit is contained in:
akwizgran
2017-07-03 11:19:15 +00:00
parent ef7483ab01 660a25f21d
commit 01971768ce
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/main/res/values/strings.xml
View File

@@ -339,10 +339,14 @@
<!-- Settings Notifications --> <!-- Settings Notifications -->
<string name="notification_settings_title">Notifications</string> <string name="notification_settings_title">Notifications</string>
<string name="notify_private_messages_setting">Show alerts for private messages</string> <string name="notify_private_messages_setting_title">Private messages</string>
<string name="notify_group_messages_setting">Show alerts for group messages</string> <string name="notify_private_messages_setting_summary">Show alerts for private messages</string>
<string name="notify_forum_posts_setting">Show alerts for forum posts</string> <string name="notify_group_messages_setting_title">Group messages</string>
<string name="notify_blog_posts_setting">Show alerts for blog posts</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_vibration_setting">Vibrate</string>
<string name="notify_sound_setting">Sound</string> <string name="notify_sound_setting">Sound</string>
<string name="notify_sound_setting_default">Default ringtone</string> <string name="notify_sound_setting_default">Default ringtone</string>

12
briar-android/src/main/res/xml/settings.xml
View File

@@ -61,25 +61,29 @@
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_notify_private_messages" android:key="pref_key_notify_private_messages"
android:persistent="false" 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 <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_notify_group_messages" android:key="pref_key_notify_group_messages"
android:persistent="false" 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 <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_notify_forum_posts" android:key="pref_key_notify_forum_posts"
android:persistent="false" 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 <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="pref_key_notify_blog_posts" android:key="pref_key_notify_blog_posts"
android:persistent="false" 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 <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"