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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-03-24 15:29:02 +01:00
parent fe32e7bff4 8b4388e1a2
commit f9ef1160ca
136 changed files with 1910 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -86,16 +86,10 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.FirstTimeActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity
android:name=".ui.CreateKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:windowSoftInputMode="adjustResize"
android:label="@string/title_create_key"
android:label="@string/title_manage_my_keys"
android:parentActivityName=".ui.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
@@ -418,7 +412,7 @@
<activity
android:name=".ui.ViewKeyAdvActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_advanced_key_info"/>
android:label="@string/title_advanced_key_info" />
<activity
android:name=".ui.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -660,6 +654,10 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
</activity>
<activity
android:name=".ui.LogDisplayActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_log_display" />
<activity
android:name=".ui.ConsolidateDialogActivity"
android:theme="@android:style/Theme.NoDisplay" />
@@ -714,14 +712,12 @@
android:name=".remote.ui.RemoteServiceActivity"
android:exported="false"
android:label="@string/app_name"
android:launchMode="singleTop"
android:process=":remote_api" />
android:launchMode="singleTop" />
<activity
android:name=".remote.ui.SelectSignKeyIdActivity"
android:exported="false"
android:label="@string/app_name"
android:launchMode="singleTop"
android:process=":remote_api" />
android:launchMode="singleTop" />
<activity
android:name=".remote.ui.AppSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -749,13 +745,10 @@
</intent-filter>
</service>
<activity
android:name=".ui.LogDisplayActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_log_display"
android:exported="false" />
<service android:name=".service.DummyAccountService">
<!-- Contact Sync services -->
<service
android:name=".service.DummyAccountService"
tools:ignore="ExportedService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
@@ -767,7 +760,8 @@
<service
android:name=".service.ContactSyncAdapterService"
android:exported="true"
android:process=":sync">
android:process=":sync"
tools:ignore="ExportedService">
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
@@ -780,6 +774,7 @@
android:resource="@xml/custom_pgp_contacts_structure" />
</service>
<!-- Storage Provider for temporary decrypted files -->
<provider
android:name=".provider.TemporaryStorageProvider"
android:authorities="org.sufficientlysecure.keychain.tempstorage"