diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:02:18 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 16:02:18 +0200 |
| commit | 7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1 (patch) | |
| tree | 0922b17b327a0cc7be149b15cd369457779b91c3 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | d004bf236bd51817adf5963a3f970acd4e5a243e (diff) | |
| parent | 7891560fc2ab46951d952b0ed9000fe007a4fe10 (diff) | |
| download | open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.tar.gz open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.tar.bz2 open-keychain-7e5918efa36e3a2f8c34868d8e17c80b2ef1eac1.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
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 |