diff options
| author | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-04 18:02:03 +0100 |
| commit | 14b688e0fbe62a0fef0fadcc20763faa21801d7a (patch) | |
| tree | 37fc7b87aa21326b0ca7ba97fee84aaf0ea6d3c2 /src/main/res/xml | |
| parent | 9e96d80e31c5d0455c4b15984eef5709cf1071fc (diff) | |
| parent | 91ec4839acef3e395e83815f211dd9771af1287e (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index ca6af3f2a..83d019fc7 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -207,6 +207,17 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/pref_expert_options_other"> <CheckBoxPreference + android:key="autojoin" + android:defaultValue="true" + android:title="@string/pref_autojoin" + android:summary="@string/pref_autojoin_summary" + /> + <CheckBoxPreference + android:defaultValue="true" + android:key="indicate_received" + android:summary="@string/pref_use_indicate_received_summary" + android:title="@string/pref_use_indicate_received"/> + <CheckBoxPreference android:defaultValue="true" android:key="keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" |