diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
| commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
| tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/xml/sync_preferences.xml | |
| parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
| parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
| download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip | |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/xml/sync_preferences.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml index de41ff030..600ccc9e8 100644 --- a/OpenKeychain/src/main/res/xml/sync_preferences.xml +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -4,6 +4,12 @@ android:persistent="false" android:title="@string/label_sync_settings_keyserver_title"/> <SwitchPreference + android:key="enableWifiSyncOnly" + android:defaultValue="true" + android:persistent="true" + android:dependency="syncKeyserver" + android:title="@string/label_sync_settings_wifi_title"/> + <SwitchPreference android:key="syncContacts" android:persistent="false" android:title="@string/label_sync_settings_contacts_title" /> |