diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-04-25 19:09:50 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-04-25 19:09:50 +0200 |
commit | 0fda254d486f8eb97a5fc844698f00d006498317 (patch) | |
tree | fa04c9a3f62c68b6b743ee1407a569c43cab66f2 /src/main/res/xml | |
parent | 5ea1c547d5d956473d3bce83d1f4354c0936ac6f (diff) | |
parent | da367dd752b6c92a3d0dbc558c80ebc71ef7b1fe (diff) |
Merge pull request #1135 from BrianBlade/manage_certificates
Add option to remove manually approved certificates
Diffstat (limited to 'src/main/res/xml')
-rw-r--r-- | src/main/res/xml/preferences.xml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9cf0100f..417e60a4 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -142,6 +142,17 @@ android:title="@string/pref_display_enter_key" android:summary="@string/pref_display_enter_key_summary" /> </PreferenceCategory> + <PreferenceCategory android:title="@string/pref_certificate_options"> + <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" /> + <Preference + android:key="remove_trusted_certificates" + android:title="@string/pref_remove_trusted_certificates_title" + android:summary="@string/pref_remove_trusted_certificates_summary" /> + </PreferenceCategory> <PreferenceCategory android:title="@string/pref_expert_options_other" > <CheckBoxPreference android:defaultValue="false" @@ -153,11 +164,6 @@ 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> |