aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-06 21:23:49 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-06 21:23:49 +0200
commit1e5c64a1f569ebe8a893cdff9a4d8957849220b3 (patch)
tree75bbcb3a1d8d40895903fb38b2a3bee008367dc7 /src/main/res/xml
parent6582ac6e72a1f9bf55f2f6d8457114a6426c1062 (diff)
parentb88128241eb7deb6599e946dc009fdc5dfd32974 (diff)
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/preferences.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index ed117866f..6897d6f15 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -164,6 +164,11 @@
android:title="@string/pref_use_indicate_received" />
<CheckBoxPreference
android:defaultValue="true"
+ android:key="last_activity"
+ android:title="@string/pref_broadcast_last_activity"
+ android:summary="@string/pref_broadcast_last_activity_summary"/>
+ <CheckBoxPreference
+ android:defaultValue="true"
android:key="crashreport"
android:summary="@string/pref_send_crash_summary"
android:title="@string/pref_send_crash" />