Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1045-preference-divider' into 'master'

Browse Source 
Don't use a custom widget to separate preference categories

Closes #1045

See merge request !609
This commit is contained in:
akwizgran
2017-10-17 17:03:13 +00:00
parent c6756d2145 4fe4c298d7
commit 4173fc4daa
4 changed files with 23 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/res/layout/divider_preference.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider">
</View>

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

@@ -25,6 +25,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:title="@string/security_settings_title">
@@ -39,6 +41,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:title="@string/panic_setting_title">
@@ -54,6 +58,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:title="@string/notification_settings_title">
@@ -61,36 +67,36 @@
android:defaultValue="true"
android:key="pref_key_notify_private_messages"
android:persistent="false"
android:title="@string/notify_private_messages_setting_title"
android:summary="@string/notify_private_messages_setting_summary"/>
android:summary="@string/notify_private_messages_setting_summary"
android:title="@string/notify_private_messages_setting_title"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_key_notify_group_messages"
android:persistent="false"
android:title="@string/notify_group_messages_setting_title"
android:summary="@string/notify_group_messages_setting_summary"/>
android:summary="@string/notify_group_messages_setting_summary"
android:title="@string/notify_group_messages_setting_title"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_key_notify_forum_posts"
android:persistent="false"
android:title="@string/notify_forum_posts_setting_title"
android:summary="@string/notify_forum_posts_setting_summary"/>
android:summary="@string/notify_forum_posts_setting_summary"
android:title="@string/notify_forum_posts_setting_title"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_key_notify_blog_posts"
android:persistent="false"
android:title="@string/notify_blog_posts_setting_title"
android:summary="@string/notify_blog_posts_setting_summary"/>
android:summary="@string/notify_blog_posts_setting_summary"
android:title="@string/notify_blog_posts_setting_title"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_key_notify_lock_screen"
android:persistent="false"
android:title="@string/notify_lock_screen_setting_title"
android:summary="@string/notify_lock_screen_setting_summary"
android:title="@string/notify_lock_screen_setting_title"
android:visibility="gone"/>
<CheckBoxPreference
@@ -105,6 +111,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:title="@string/feedback_settings_title">