sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed default setting for enter_is_send on devices with keyboard

This commit is contained in:
Daniel Gultsch 2017-03-02 13:03:30 +01:00
parent c740386297
commit 8cce653a1f
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -1774,7 +1774,7 @@ public class ConversationActivity extends XmppActivity
} }
public boolean enterIsSend() { public boolean enterIsSend() {
return getPreferences().getBoolean("enter_is_send",false); return getPreferences().getBoolean("enter_is_send",getResources().getBoolean(R.bool.enter_is_send));
} }
@Override @Override

4
src/main/res/values-qwerty/defaults.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="enter_is_send">true</bool>
</resources>

1
src/main/res/values/defaults.xml
View File

@ -2,4 +2,5 @@
<resources> <resources>
<string name="default_resource">Phone</string> <string name="default_resource">Phone</string>
<bool name="portrait_only">true</bool> <bool name="portrait_only">true</bool>
<bool name="enter_is_send">false</bool>
</resources> </resources>

2
src/main/res/xml/preferences.xml
View File

@ -220,7 +220,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_input_options"> <PreferenceCategory android:title="@string/pref_input_options">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="@bool/enter_is_send"
android:key="enter_is_send" android:key="enter_is_send"
android:summary="@string/pref_enter_is_send_summary" android:summary="@string/pref_enter_is_send_summary"
android:title="@string/pref_enter_is_send"/> android:title="@string/pref_enter_is_send"/>