aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-07 12:24:27 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-07 12:24:27 +0300
commit9306b5ce325d0c3a968a4a0e64468163666addb7 (patch)
tree6e8c312917f65b7a3f8a68d38124cc6024cd1675 /OpenKeychain/src/main/AndroidManifest.xml
parentd4612b5e173455a24adbae2bfd4654ae065556cc (diff)
parentc8b112c70d9f45b00bfd30e2ac746bfbbb31671e (diff)
downloadopen-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.gz
open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.tar.bz2
open-keychain-9306b5ce325d0c3a968a4a0e64468163666addb7.zip
Merge branch 'backup-api'
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 7247077d9..bead69c58 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -884,6 +884,10 @@
android:name=".remote.ui.RemoteImportKeysActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_import_keys" />
+ <activity
+ android:name=".remote.ui.RemoteBackupActivity"
+ android:configChanges="keyboardHidden|keyboard"
+ android:label="@string/title_backup" />
<!-- Usb interceptor activity -->
<activity