aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-14 22:54:02 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-14 22:54:02 +0100
commita3f9f30a6c1751c44f7eb4af23d44f67f00a568c (patch)
tree75ead91b78461733d306259c4cf61fe98562bc3a /src/main/res
parenta6a9ed487786451f0eedfaa63fbbc5332d4adcf3 (diff)
parent0a96bec3c1d65c0d3da22511f3b92a21fd94ad0f (diff)
Merge pull request #885 from SamWhited/display-enter-key
Add option to swap enter/emoticon key
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 54e81a2d..54ab2c50 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -435,6 +435,8 @@
<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>
+ <string name="pref_display_enter_key">Show enter key</string>
+ <string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string>
<string name="audio">audio file</string>
<string name="video">video file</string>
<string name="pdf_document">PDF document</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 3f18512b..2ff6800b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -128,6 +128,11 @@
android:key="enter_is_send"
android:title="@string/pref_enter_is_send"
android:summary="@string/pref_enter_is_send_summary" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="display_enter_key"
+ android:title="@string/pref_display_enter_key"
+ android:summary="@string/pref_display_enter_key_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_expert_options_other" >
<CheckBoxPreference