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
commitbc279dfd2cffaf8278ee0750aa2c05af9e4091e0 (patch)
tree03c5e7d12422cb17d1c1180450b9ee4afbb2cd99 /res/xml
parentc30014c45e61a0712b5b74d0ecdf0cc44386c50f (diff)
parent47e1a6d2dd8e1416dcf4944c0258e999e7102677 (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