Work on new Import activity

2013-09-19 02:02:51 +02:00
parent 4c461c1b44
commit 3c4cb1c2d3
20 changed files with 655 additions and 234 deletions
--- a/OpenPGP-Keychain/res/values/arrays.xml
+++ b/OpenPGP-Keychain/res/values/arrays.xml
@@ -49,4 +49,11 @@
        <item>@string/key_size_2048</item>
        <item>@string/key_size_4096</item>
    </string-array>
+    <string-array name="import_action_list">
+        <item>@string/menu_importFromFile</item>
+        <item>@string/menu_keyServer</item>
+        <item>@string/menu_importFromQrCode</item>
+        <item>@string/menu_importFromNfc</item>
+    </string-array>
+
 </resources>