aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml5
3 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 15a25054a..208c43e63 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -102,5 +102,6 @@
<bool name="validate_hostname">false</bool>
<bool name="show_foreground_service">true</bool>
<bool name="warn_unencrypted_chat">true</bool>
+ <bool name="use_bundled_emoji">true</bool>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e8f72f3ca..6b3f41556 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -744,4 +744,6 @@
<string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string>
<string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string>
<string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string>
+ <string name="pref_use_bundled_emoji">Use integrated emojis</string>
+ <string name="pref_use_bundled_emoji_summary">Use the integrated emoji library instead of using your devices ones. Changes will be available after reopening the app.</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 70ce4e76c..82d9ea00f 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -267,6 +267,11 @@
android:key="show_dynamic_tags"
android:summary="@string/pref_show_dynamic_tags_summary"
android:title="@string/pref_show_dynamic_tags" />
+ <CheckBoxPreference
+ android:defaultValue="@bool/use_bundled_emoji"
+ android:key="use_bundled_emoji"
+ android:summary="@string/pref_use_bundled_emoji_summary"
+ android:title="@string/pref_use_bundled_emoji" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_security_settings">
<CheckBoxPreference