diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
| commit | d9c937bbe762736d9f0c45d5ba0083555c8da2e1 (patch) | |
| tree | e5cbd2300622e555283867f39767bf34b9dd5796 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | e106079b90f7d596a254b223b6e8741fc6d94785 (diff) | |
| parent | 825f37eee4be6a4dc527391e6238668e6d147a36 (diff) | |
| download | open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.gz open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.bz2 open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.zip | |
Merge branch 'master' into improve-file
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 31c809334..b3a4d5960 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -445,6 +445,12 @@ </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"> <intent-filter> <action android:name="android.accounts.AccountAuthenticator"/> |