diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 4 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 2db0e7c38..b8927019f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1738,11 +1738,11 @@ public class ConversationActivity extends XmppActivity } public boolean useSendButtonToIndicateStatus() { - return getPreferences().getBoolean("send_button_status", false); + return getPreferences().getBoolean("send_button_status", true); } public boolean indicateReceived() { - return getPreferences().getBoolean("indicate_received", false); + return getPreferences().getBoolean("indicate_received", true); } public boolean useWhiteBackground() { diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 797f17bb5..6bb60e722 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -101,11 +101,6 @@ android:key="picture_compression" android:summary="@string/pref_picture_compression_summary" android:title="@string/pref_picture_compression" /> - <CheckBoxPreference - android:defaultValue="false" - android:key="return_to_previous" - android:summary="@string/pref_return_to_previous_summary" - android:title="@string/pref_return_to_previous" /> </PreferenceScreen> <!--status--> <PreferenceScreen @@ -240,6 +235,5 @@ android:icon="@drawable/ic_help_black_24dp" android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about" /> - - + </PreferenceScreen> |