diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:58 +0100 |
| commit | f9ef1160ca764d508dafcb45fbf65f18911fff9c (patch) | |
| tree | 816564326b238848669d7a0713f48c84791cd13b /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (diff) | |
| parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
| download | open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.gz open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.bz2 open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index fc6a9e81e..6cfc0f5a1 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -87,15 +87,9 @@ </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" @@ -661,6 +655,10 @@ 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" /> <activity @@ -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" |