From 725b1a7406a06584e1b15a1cc273e926ec9e6804 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 14:22:34 +0200
Subject: introduced setting to not scroll down after sending a message

---
 src/main/res/values/defaults.xml | 1 +
 src/main/res/values/strings.xml  | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 67545e6a9..425e397c9 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -101,5 +101,6 @@
     <bool name="use_bundled_emoji">true</bool>
     <bool name="enable_multi_accounts">false</bool>
     <bool name="show_qr_code_scan">true</bool>
+    <bool name="scroll_to_bottom">true</bool>
 </resources>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5e7ac836e..d0432d342 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -767,4 +767,6 @@
     <string name="once">Once</string>
     <string name="theme">Theme</string>
     <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string>
+    <string name="pref_scroll_to_bottom_summary">Scroll down after sending a message</string>
+    <string name="pref_scroll_to_bottom">Scroll to bottom</string>
 </resources>
-- 
cgit v1.2.3