diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-15 21:14:53 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-15 21:14:53 +0200 |
| commit | e4b113701cfd12b89a18365491b50f6508184bc2 (patch) | |
| tree | 19672479027e592e23cba851f07a9fe79e3a33f7 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 4cef97be5f4cd75fac252c8d3c739990604000df (diff) | |
| parent | 1dafd1b629102180d7e6cb7bb31d1959f1ff6665 (diff) | |
| download | open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.tar.gz open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.tar.bz2 open-keychain-e4b113701cfd12b89a18365491b50f6508184bc2.zip | |
Merge remote-tracking branch 'origin/master'
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 93c75cca6..83d8bce91 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -683,6 +683,12 @@ android:name=".ui.PassphraseDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> <activity + android:name=".ui.RetryUploadDialogActivity" + android:theme="@android:style/Theme.NoDisplay" /> + <activity + android:name=".ui.DeleteKeyDialogActivity" + android:theme="@android:style/Theme.NoDisplay" /> + <activity android:name=".ui.OrbotRequiredDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> <activity android:name=".ui.PassphraseWizardActivity" /> |