diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
| commit | 2f95100d88954db389cba8e615390795d121c1c8 (patch) | |
| tree | 1bf4ffb29bb83fac33ba2ed7c84fb1d6a8af2bd4 /OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml | |
| parent | 90ac60b6db0637fbefbce5cb2cd80a64f5bb708d (diff) | |
| parent | 638554f2560b3c5fd36ca9b4ba205cb5a999b84b (diff) | |
| download | open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.gz open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.bz2 open-keychain-2f95100d88954db389cba8e615390795d121c1c8.zip | |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml')
| -rw-r--r-- | OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml deleted file mode 100644 index b38e07a36..000000000 --- a/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <PreferenceCategory android:title="OpenKeychain Intents"> - <Preference - android:key="intent_demo" - android:title="Intent Demo" /> - </PreferenceCategory> - <PreferenceCategory android:title="OpenPGP Provider API"> - <org.openintents.openpgp.util.OpenPgpListPreference - android:key="openpgp_provider_list" - android:title="Select OpenPGP Provider!" /> - <Preference - android:key="openpgp_provider_demo" - android:title="OpenPGP Provider Demo" /> - </PreferenceCategory> - -</PreferenceScreen>
\ No newline at end of file |