4 files changed, 21 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 1ba8a6d2d..70b8616d4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -518,5 +518,7 @@
     <string name="unknown_algorithm">unknown</string>
     <string name="can_sign_not">cannot sign</string>
     <string name="error_no_encrypt_subkey">No encryption subkey available!</string>
+    <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.
+        For more information, see Help.</string>
 
 </resources>
diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml
new file mode 100644
index 000000000..94ffdf40b
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/account_desc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:accountType="org.sufficientlysecure.keychain"
+                       android:icon="@drawable/icon"
+                       android:label="@string/app_name"/>
diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
new file mode 100644
index 000000000..3318f3b45
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
+    <ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
+                      android:icon="@drawable/key_small"
+                      android:summaryColumn="data1"
+                      android:detailColumn="data2"/>
+</ContactsSource>
+\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
new file mode 100644
index 000000000..d8fe60e91
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
@@ -0,0 +1,6 @@
+<?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"
+              android:supportsUploading="false"
+              android:userVisible="true"/>
+\ No newline at end of file