diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/xml/preference_headers.xml | |
parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/xml/preference_headers.xml')
-rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index b7512b062..0c171467b 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,14 +1,29 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> <!--<header--> - <!--android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$GuiPrefsFragment"--> - <!--android:title="@string/section_gui" />--> + <!--android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$GuiPrefsFragment"--> + <!--android:title="@string/section_gui" />--> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment" + android:icon="@drawable/ic_cloud_black_24dp" + android:summary="Keyserver, keybase.io" android:title="@string/section_cloud_search" /> <header - android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$PassphrasePrefsFragment" + android:icon="@drawable/ic_lock_black_24dp" + android:summary="@string/section_passphrase_cache_summary" android:title="@string/section_passphrase_cache" /> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" + android:icon="@drawable/ic_settings_ethernet_black_24dp" + android:summary="@string/section_proxy_settings_summary" android:title="@string/section_proxy_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment" + android:icon="@drawable/ic_sync_black_24dp" + android:summary="@string/section_sync_settings_summary" + android:title="@string/section_sync_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment" + android:icon="@drawable/ic_extension_black_24dp" + android:title="@string/section_experimental_features" /> </preference-headers> |