aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java2
-rw-r--r--src/main/res/values-qwerty/defaults.xml4
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/xml/preferences.xml2
4 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 029d0c86c..a1e2a344b 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -2073,7 +2073,7 @@ public class ConversationActivity extends XmppActivity
}
public boolean enterIsSend() {
- return getPreferences().getBoolean("enter_is_send", false);
+ return getPreferences().getBoolean("enter_is_send", getResources().getBoolean(R.bool.enter_is_send));
}
@Override
diff --git a/src/main/res/values-qwerty/defaults.xml b/src/main/res/values-qwerty/defaults.xml
new file mode 100644
index 000000000..17e88c0bb
--- /dev/null
+++ b/src/main/res/values-qwerty/defaults.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <bool name="enter_is_send">true</bool>
+</resources> \ No newline at end of file
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index a6c900eba..dd0ba1ccb 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -2,4 +2,5 @@
<resources>
<string name="default_resource" translatable="false">Phone</string>
<bool name="portrait_only">true</bool>
+ <bool name="enter_is_send">false</bool>
</resources> \ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index ac3ea1445..fe21e2390 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -253,7 +253,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_input_options">
<CheckBoxPreference
- android:defaultValue="false"
+ android:defaultValue="@bool/enter_is_send"
android:key="enter_is_send"
android:summary="@string/pref_enter_is_send_summary"
android:title="@string/pref_enter_is_send" />