diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
commit | baea31847022ce88906a0190638ddffed82c8a7c (patch) | |
tree | cdd080f224a82a377295a02f64f62fb7534012cb /OpenKeychain/src/main/res/xml | |
parent | c8790f404aaf76db967a16c8fea79eb6f90c8bce (diff) | |
parent | 98ba424576946d2f5ef529c5506113b71b0266c4 (diff) | |
download | open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2 open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
-rw-r--r-- | OpenKeychain/src/main/res/xml/account_desc.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/sync_adapter_desc.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml index d29395202..6d8d76b02 100644 --- a/OpenKeychain/src/main/res/xml/account_desc.xml +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" - android:accountType="org.sufficientlysecure.keychain.account" + android:accountType="@string/account_type" android:icon="@drawable/ic_launcher" android:label="@string/app_name" /> diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml index 6871e1a5d..a134fdebe 100644 --- a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml +++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" android:contentAuthority="com.android.contacts" - android:accountType="org.sufficientlysecure.keychain.account" + android:accountType="@string/account_type" android:supportsUploading="false" android:userVisible="true" android:allowParallelSyncs="false" |