diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 13:44:34 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 13:44:34 +0200 |
| commit | f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833 (patch) | |
| tree | 2a778734d50f7470f9b1cf9b31a50f8209b597df /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | c30c36fb2ac5ab1711bca21f0ba14d9f3ef6e074 (diff) | |
| download | open-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.tar.gz open-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.tar.bz2 open-keychain-f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833.zip | |
New add keys activity
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index a00b6f01c..68153af34 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -615,6 +615,16 @@ android:value=".ui.KeyListActivity" /> </activity> <activity + android:name=".ui.AddKeysActivity" + android:configChanges="orientation|screenSize|keyboardHidden|keyboard" + android:label="@string/title_add_keys" + android:windowSoftInputMode="stateHidden" + android:parentActivityName=".ui.KeyListActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value=".ui.KeyListActivity" /> + </activity> + <activity android:name=".ui.ConsolidateDialogActivity" android:theme="@android:style/Theme.NoDisplay" /> <activity @@ -634,14 +644,14 @@ android:allowTaskReparenting="true" /> <!--<activity--> - <!--android:name=".ui.NfcIntentActivity"--> - <!--android:launchMode="singleTop">--> - <!--<intent-filter>--> - <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />--> - - <!--<category android:name="android.intent.category.DEFAULT" />--> - <!--<data android:host="my.yubico.com" android:scheme="https"/>--> - <!--</intent-filter>--> + <!--android:name=".ui.NfcIntentActivity"--> + <!--android:launchMode="singleTop">--> + <!--<intent-filter>--> + <!--<action android:name="android.nfc.action.NDEF_DISCOVERED" />--> + + <!--<category android:name="android.intent.category.DEFAULT" />--> + <!--<data android:host="my.yubico.com" android:scheme="https"/>--> + <!--</intent-filter>--> <!--</activity>--> <activity |