diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/xml | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 97874738..2c666baa 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -121,12 +121,19 @@ android:key="dont_save_encrypted" android:summary="@string/pref_dont_save_encrypted_summary" android:title="@string/pref_dont_save_encrypted" /> - <CheckBoxPreference - android:defaultValue="false" - android:key="enable_legacy_ssl" - 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" /> + <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 android:defaultValue="false" |