diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
| commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
| tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/xml/cloud_search_prefs.xml | |
| parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
| parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
| download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/xml/cloud_search_prefs.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/xml/cloud_search_prefs.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml new file mode 100644 index 000000000..c87c4df7b --- /dev/null +++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:title="Search Keyserver" + android:defaultValue="true" + android:summary="Search HKP keyserver" + android:key="search_keyserver_pref" /> + + <CheckBoxPreference + android:title="Search Keybase.io" + android:defaultValue="true" + android:summary="Search Keybase.io index" + android:key="search_keybase_pref" /> + + <PreferenceScreen + android:key="keyServers" + android:persistent="false" + android:title="@string/label_keyservers" /> +</PreferenceScreen>
\ No newline at end of file |