diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-30 11:20:35 +0100 |
| commit | f2c1a80059af89caeb299a5cc02c401da6b4b138 (patch) | |
| tree | c868409a94abdee41313e4509c8625701bfdd4ff /res/xml/preferences.xml | |
| parent | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (diff) | |
| parent | 7b4f3637db8c99d84fe3c825d583bfc0fa91fada (diff) | |
Merge branch 'development'
Diffstat (limited to 'res/xml/preferences.xml')
| -rw-r--r-- | res/xml/preferences.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index eccc8bae..06ab7560 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -51,6 +51,7 @@ android:title="@string/pref_sound" /> <CheckBoxPreference + android:defaultValue="true" android:dependency="show_notification" android:key="always_notify_in_conference" android:summary="@string/pref_conference_notifications_summary" @@ -88,6 +89,11 @@ android:key="dont_save_encrypted" android:summary="@string/pref_dont_save_encrypted_summary" android:title="@string/pref_dont_save_encrypted" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="enable_legacy_ssl" + android:summary="@string/pref_enable_legacy_ssl_summary" + android:title="@string/pref_enable_legacy_ssl" /> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_expert_options_other" > <CheckBoxPreference @@ -105,4 +111,4 @@ android:title="@string/pref_never_send_crash" /> </PreferenceCategory> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> |