5 files changed, 50 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/res/layout/lists_activity.xml b/OpenPGP-Keychain/res/layout/lists_activity.xml
new file mode 100644
index 000000000..58b0906d3
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/lists_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/lists_tabs_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/key_list_public.xml b/OpenPGP-Keychain/res/menu/key_list_public.xml
new file mode 100644
index 000000000..7b6261558
--- /dev/null
+++ b/OpenPGP-Keychain/res/menu/key_list_public.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_key_list_public_import"
+        android:showAsAction="always|withText"
+        android:title="@string/menu_import"/>
+    <item
+        android:id="@+id/menu_key_list_public_export"
+        android:showAsAction="never"
+        android:title="@string/menu_export_keys"/>
+
+</menu>
+\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret.xml b/OpenPGP-Keychain/res/menu/key_list_secret.xml
new file mode 100644
index 000000000..c610eda35
--- /dev/null
+++ b/OpenPGP-Keychain/res/menu/key_list_secret.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_key_list_secret_create"
+        android:showAsAction="always|withText"
+        android:title="@string/menu_create_key"/>
+    <item
+        android:id="@+id/menu_key_list_secret_create_expert"
+        android:showAsAction="never"
+        android:title="@string/menu_create_key_expert"/>
+    <item
+        android:id="@+id/menu_key_list_secret_import"
+        android:showAsAction="never"
+        android:title="@string/menu_import"/>
+    <item
+        android:id="@+id/menu_key_list_secret_export"
+        android:showAsAction="never"
+        android:title="@string/menu_export_keys"/>
+
+</menu>
+\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/res/menu/key_view.xml
index 3798cb935..1078cd937 100644
--- a/OpenPGP-Keychain/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/res/menu/key_view.xml
@@ -52,9 +52,6 @@
     <item
         android:id="@+id/menu_key_view_delete"
         android:showAsAction="never"
-        android:title="@string/menu_delete_key">
-        <menu>
-        </menu>
-    </item>
+        android:title="@string/menu_delete_key"/>
 
 </menu>
 \ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 0e4f42c59..d870c1289 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -83,6 +83,7 @@
     <string name="menu_api_app_settings">Registered Apps</string>
     <string name="menu_import_from_file">Import from file</string>
     <string name="menu_import_from_qr_code">Import from QR Code</string>
+    <string name="menu_import">Import</string>
     <string name="menu_import_from_nfc">Import from NFC</string>
     <string name="menu_export_keys">Export all keys</string>
     <string name="menu_export_key">Export to file</string>
@@ -101,7 +102,7 @@
     <string name="menu_sign_key">Sign key</string>
     <string name="menu_beam_preferences">Beam settings</string>
     <string name="menu_key_edit_cancel">Cancel</string>
-    
+
     <!-- label -->
     <string name="label_sign">Sign</string>
     <string name="label_message">Message</string>