cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into v/multi-decrypt

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-11 17:12:07 +02:00
parent c8790f404a 98ba424576
commit baea318470
145 changed files with 254 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/xml/account_desc.xml
View File

@@ -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" />

2
OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
View File

@@ -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"