From f0ee7ed4cf91427a12fa7dd55dc67b7f6c5c4833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 4 Oct 2014 13:44:34 +0200
Subject: New add keys activity

---
 OpenKeychain/src/main/AndroidManifest.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'OpenKeychain/src/main/AndroidManifest.xml')

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
@@ -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" />-->
-
-                <!--<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
-- 
cgit v1.2.3