mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-24 21:15:48 +00:00
committed by
Moxie Marlinspike
parent
142f84703b
commit
0f572d1e5d
@@ -1,12 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<CheckBoxPreference android:defaultValue="false"
|
||||
android:key="pref_toggle_push_messaging"
|
||||
android:title="@string/preferences__use_data_channel"
|
||||
android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"
|
||||
android:icon="?pref_ic_push"/>
|
||||
|
||||
<Preference android:key="preference_category_sms_mms"
|
||||
android:title="@string/preferences__sms_mms"
|
||||
android:icon="?pref_ic_sms_mms"/>
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<CheckBoxPreference android:defaultValue="false"
|
||||
android:key="pref_toggle_push_messaging"
|
||||
android:title="@string/preferences__textsecure_messages"
|
||||
android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"/>
|
||||
|
||||
<CheckBoxPreference android:defaultValue="false"
|
||||
android:key="pref_enter_key"
|
||||
android:title="@string/preferences__enable_enter_key_title"
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
android:title="@string/preferences__pref_all_mms_title" />
|
||||
|
||||
<Preference android:key="pref_set_default"
|
||||
android:title="@string/preferences__make_default_sms_app"
|
||||
android:summary="@string/preferences__make_textsecure_the_default_sms_mms_app" />
|
||||
android:title="@string/ApplicationPreferencesActivity_sms_disabled"
|
||||
android:summary="@string/ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app" />
|
||||
|
||||
<CheckBoxPreference android:defaultValue="false"
|
||||
android:key="pref_delivery_report_sms"
|
||||
|
||||
Reference in New Issue
Block a user