diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-03-04 17:09:49 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-03-04 17:09:49 +0100 |
| commit | 777cba79a72201c7b85bc6725c8bf88943796d9a (patch) | |
| tree | 366ddad8c08bf37a2f9279ee2e21d9b4155e256c /src/main | |
| parent | cedc4305c20aa76aa6ffa9a5443578e57023e1ca (diff) | |
changed default setting for enter_is_send on devices with keyboard
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/values-qwerty/defaults.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 2 |
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" /> |