aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-09 19:23:26 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-09 19:23:26 +0100
commit06eae476ee7e19029fe1ac28eae75fdcc1d4d1e6 (patch)
tree54180483627e4d9470f566d17033d6dbc5790c74 /src/main/res
parent0a48f777acefa29443743f68f242136309169ba2 (diff)
Introduced expert options to control enter-is-send
(default == off)
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml3
-rw-r--r--src/main/res/xml/preferences.xml7
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9cb60cf83..31f4dbea3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -434,4 +434,7 @@
<string name="two_hours">2 hours</string>
<string name="eight_hours">8 hours</string>
<string name="until_further_notice">Until further notice</string>
+ <string name="pref_input_options">Input options</string>
+ <string name="pref_enter_is_send">Enter is send</string>
+ <string name="pref_enter_is_send_summary">Use enter key to send message</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9974f14d4..3f18512b8 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -122,6 +122,13 @@
android:summary="@string/pref_enable_legacy_ssl_summary"
android:title="@string/pref_enable_legacy_ssl" />
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_input_options">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="enter_is_send"
+ android:title="@string/pref_enter_is_send"
+ android:summary="@string/pref_enter_is_send_summary" />
+ </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_expert_options_other" >
<CheckBoxPreference
android:defaultValue="false"