From d0c6971273f76ce0766f90ea9fb6dacbeb5dd3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 5 Apr 2014 23:40:11 +0200
Subject: Remove import activity from drawer, make it reachable from key list
 only

---
 OpenPGP-Keychain/src/main/res/menu/key_list.xml | 31 ++++++++++---------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res')

diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index 9f285388b..3f80b616d 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -10,27 +10,10 @@
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
-        android:id="@+id/menu_key_list_add"
+        android:id="@+id/menu_key_list_import"
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_add_person"
-        android:title="@string/menu_add_keys">
-        <menu>
-            <item
-                android:id="@+id/menu_key_list_import"
-                app:showAsAction="never"
-                android:title="@string/menu_import" />
-
-            <item
-                android:id="@+id/menu_key_list_create"
-                app:showAsAction="never"
-                android:title="@string/menu_create_key" />
-
-            <item
-                android:id="@+id/menu_key_list_create_expert"
-                app:showAsAction="never"
-                android:title="@string/menu_create_key_expert" />
-        </menu>
-    </item>
+        android:title="@string/menu_add_keys" />
 
     <item
         android:id="@+id/menu_key_list_export"
@@ -38,4 +21,14 @@
         android:icon="@drawable/ic_action_import_export"
         android:title="@string/menu_export_all_keys" />
 
+    <item
+        android:id="@+id/menu_key_list_create"
+        app:showAsAction="never"
+        android:title="@string/menu_create_key" />
+
+    <item
+        android:id="@+id/menu_key_list_create_expert"
+        app:showAsAction="never"
+        android:title="@string/menu_create_key_expert" />
+
 </menu>
-- 
cgit v1.2.3