summaryrefslogtreecommitdiff
path: root/res/xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-20 22:34:08 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-20 22:34:08 +0200
commit35fc78f5c1cfaf4f3a35a67b0e9f851bdbd8c40d (patch)
tree04db58ce7b71bf0bbd45a710a265cb69ba338f05 /res/xml
parent671525e962d8ba2685b0162acfc3f17ca6657e21 (diff)
parent43db1220cf00cb7d144b78cec8ec26a274770147 (diff)
Merge with 4fe04f90d7c3f24b98e04e3258deb3e6d0ec51d0
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/general_settings.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 74c8965f..2da80cc6 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -11,5 +11,15 @@
android:key="useCM9Fix"
android:summary="@string/owner_fix_summary"
android:title="@string/owner_fix" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="showlogwindow"
+ android:summary="@string/show_log_summary"
+ android:title="@string/show_log_window" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="statusafterconnect"
+ android:summary="@string/keppstatus_summary"
+ android:title="@string/keepstatus" />
</PreferenceScreen> \ No newline at end of file