advanced pref to use android emoji

// FREEBIE
This commit is contained in:
Jake McGinty
2015-09-07 13:11:40 -10:00
committed by Moxie Marlinspike
parent 551274f167
commit e077cc6581
7 changed files with 44 additions and 15 deletions

View File

@@ -878,6 +878,8 @@
<string name="preferences_chats__when_roaming">When roaming</string>
<string name="preferences_chats__media_auto_download">Media auto-download</string>
<string name="preferences_chats__message_trimming">Message trimming</string>
<string name="preferences_advanced__use_system_emoji">Use system emoji</string>
<string name="preferences_advanced__disable_textsecures_built_in_emoji_support">Disable TextSecure\'s built-in emoji support</string>
<!-- **************************************** -->
<!-- menus -->

View File

@@ -13,6 +13,11 @@
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
android:title="@string/preferences__pref_enter_sends_title"/>
<CheckBoxPreference android:defaultValue="false"
android:key="pref_system_emoji"
android:title="@string/preferences_advanced__use_system_emoji"
android:summary="@string/preferences_advanced__disable_textsecures_built_in_emoji_support" />
<Preference android:key="pref_choose_identity"
android:title="@string/preferences__choose_identity"
android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/>