cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New add keys activity

Browse Source
This commit is contained in:
Dominik Schürmann
2014-10-04 13:44:34 +02:00
parent c30c36fb2a
commit f0ee7ed4cf
8 changed files with 446 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -614,6 +614,16 @@
android:name="android.support.PARENT_ACTIVITY"
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" />
@@ -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" />-->
<!--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>-->
<!--<category android:name="android.intent.category.DEFAULT" />-->
<!--<data android:host="my.yubico.com" android:scheme="https"/>-->
<!--</intent-filter>-->
<!--</activity>-->
<activity