diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
| commit | defb127d6e3a1d29f60553a8e9b3f992f2127b70 (patch) | |
| tree | b220ef33d771667032a1cc2c62b0587a09a27ff9 /src/main/res/xml | |
| parent | 261b505f066b90ef346c529afea50f8285ddfd7d (diff) | |
| parent | 878066ca99c1170479fb217d68ecdb9cf5498975 (diff) | |
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 8bf6eb87..d48124a6 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -147,6 +147,11 @@ android:key="keep_foreground_service" android:title="@string/pref_keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="dont_trust_system_cas" + android:title="@string/pref_dont_trust_system_cas_title" + android:summary="@string/pref_dont_trust_system_cas_summary" /> </PreferenceCategory> </PreferenceScreen> |