diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 02:38:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-25 02:38:06 +0200 |
| commit | 33b54ab03ea611223864dded6f1f99b9eac0870b (patch) | |
| tree | 64f37b2c36ed545ea25a6214db4837ea3874cfa2 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | 1cbedb60d66b745993121d9c02d141f8beb6558a (diff) | |
| download | open-keychain-33b54ab03ea611223864dded6f1f99b9eac0870b.tar.gz open-keychain-33b54ab03ea611223864dded6f1f99b9eac0870b.tar.bz2 open-keychain-33b54ab03ea611223864dded6f1f99b9eac0870b.zip | |
Safe slinger activity preps
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index bc6912f38..3014d7093 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -135,6 +135,15 @@ android:value=".ui.ViewKeyActivity" /> </activity> <activity + android:name=".ui.SafeSlingerActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_exchange_keys" + android:parentActivityName=".ui.KeyListActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.KeyListActivity" /> + </activity> + <activity android:name=".ui.SelectPublicKeyActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_select_recipients" |