diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-20 17:55:55 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-20 17:55:55 +0200 |
| commit | 5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed (patch) | |
| tree | 2aa105658d112f1ac213dc106d87072a814bd2a2 /OpenKeychain/src/main/res/xml | |
| parent | e643e098e2ad1a762e40f4ecbe6f97f729b11e3c (diff) | |
| parent | 0251f0e41695d3961dde553ba9ab76fa46583abb (diff) | |
| download | open-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.tar.gz open-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.tar.bz2 open-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.zip | |
Merge pull request #1461 from open-keychain/keyserver-sync
Periodic Keyserver Sync
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 10 |
3 files changed, 21 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml new file mode 100644 index 000000000..3923fae59 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" + android:contentAuthority="@string/provider_content_authority" + android:accountType="@string/account_type" + android:supportsUploading="false" + android:userVisible="true" + android:allowParallelSyncs="false" + android:isAlwaysSyncable="true" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index b7512b062..606196c1e 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -11,4 +11,7 @@ <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" android:title="@string/section_proxy_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment" + android:title="@string/section_sync_settings" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml new file mode 100644 index 000000000..e870be9ec --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="syncKeyserver" + android:persistent="false" + android:title="@string/label_sync_settings_keyserver_title"/> + <CheckBoxPreference + android:key="syncContacts" + android:persistent="false" + android:title="@string/label_sync_settings_contacts_title" /> +</PreferenceScreen> |