aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-01 14:22:34 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-01 14:22:34 +0200
commit725b1a7406a06584e1b15a1cc273e926ec9e6804 (patch)
tree89b4e5aae652fb54da89d41c794cbcafac8a7f39 /src/main/res/values
parentcec483b70d6bd480ee6b3fa1be2fd2432a8d2ae6 (diff)
introduced setting to not scroll down after sending a message
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 3 insertions, 0 deletions
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>