diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-27 13:59:26 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-27 13:59:26 +0200 |
commit | c292b8d9c3497b1482f3e4856033e10d06dd9388 (patch) | |
tree | dd546bd8203a05198490bea13240c690b25e0d0a /OpenKeychain/src/main/res | |
parent | 7a98ffc90a34a381a68c5b485183373ed307320a (diff) | |
download | open-keychain-c292b8d9c3497b1482f3e4856033e10d06dd9388.tar.gz open-keychain-c292b8d9c3497b1482f3e4856033e10d06dd9388.tar.bz2 open-keychain-c292b8d9c3497b1482f3e4856033e10d06dd9388.zip |
Experimental features settings reworked
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/experimental_preferences.xml | 20 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 4 |
3 files changed, 29 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ded2da6a2..6fddd527f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -52,7 +52,7 @@ <string name="section_proxy_settings">"Proxy Settings"</string> <string name="section_gui">"Interface"</string> <string name="section_sync_settings">"Sync Settings"</string> - <string name="section_other_settings">"Other Settings"</string> + <string name="section_experimental_features">"Experimental Features"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -186,8 +186,12 @@ <!-- label shown in Android settings under the OpenKeychain account --> <string name="keyserver_sync_settings_title">"Automatically update keys"</string> - <string name="label_other_settings_experimental_title">"Enable experimental features"</string> - <string name="label_other_settings_experimental_summary">"Enable experimental features, mostly results of security/UX research. Don't rely on their security!"</string> + <string name="label_experimental_settings_desc_summary">"These features are mostly results of security/UX research. Don't rely on their security!"</string> + + <string name="label_experimental_settings_word_confirm_title">"Word Confirm"</string> + <string name="label_experimental_settings_word_confirm_summary">"Allows to compare fingerprints with words instead of hexadecimal representation."</string> + <string name="label_experimental_settings_linked_identities_title">"Linked Identities"</string> + <string name="label_experimental_settings_linked_identities_summary">"Linked Identities"</string> <!-- Proxy Preferences --> <string name="pref_proxy_tor_title">"Enable Tor"</string> diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml new file mode 100644 index 000000000..dbf19bddb --- /dev/null +++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml @@ -0,0 +1,20 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <Preference + android:persistent="false" + android:selectable="false" + android:summary="@string/label_experimental_settings_desc_summary" /> + + <SwitchPreference + android:defaultValue="false" + android:key="experimentalEnableWordConfirm" + android:persistent="false" + android:summary="@string/label_experimental_settings_word_confirm_summary" + android:title="@string/label_experimental_settings_word_confirm_title" /> + + <SwitchPreference + android:defaultValue="false" + android:key="experimentalEnableLinkedIdentities" + android:persistent="false" + android:summary="@string/label_experimental_settings_linked_identities_summary" + android:title="@string/label_experimental_settings_linked_identities_title" /> +</PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index 36fc9a7ae..4c40b9d1f 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -15,6 +15,6 @@ android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment" android:title="@string/section_sync_settings" /> <header - android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment" - android:title="@string/section_other_settings" /> + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment" + android:title="@string/section_experimental_features" /> </preference-headers> |