From db70fcfdbf63a604ccd4c8977888937161a5a9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 23:13:29 +0200
Subject: Create key: design fixes

---
 OpenKeychain/src/main/res/menu/key_list.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index e865df182..056dd5986 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -10,7 +10,7 @@
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
-        android:id="@+id/menu_key_list_import"
+        android:id="@+id/menu_key_list_add"
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_add_person"
         android:title="@string/menu_add_keys" />
@@ -26,6 +26,11 @@
         app:showAsAction="never"
         android:title="@string/menu_create_key" />
 
+    <item
+        android:id="@+id/menu_key_list_import_existing_key"
+        app:showAsAction="never"
+        android:title="@string/menu_import_existing_key" />
+
     <item
         android:id="@+id/menu_key_list_debug_read"
         app:showAsAction="never"
-- 
cgit v1.2.3


From 3d7cdf5428f7b6fbd3bd6b5b3fda24c87a62bfb8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 31 Jul 2014 23:45:19 +0200
Subject: move upload/update buttons from menu to buttons

---
 OpenKeychain/src/main/res/menu/key_view.xml | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 64877d725..5a156b5ac 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,23 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_key_keyserver"
-        android:icon="@drawable/ic_action_cloud"
-        app:showAsAction="always"
-        android:title="@string/menu_key_server">
-        <menu>
-            <item
-                android:id="@+id/menu_key_view_update"
-                app:showAsAction="never"
-                android:title="@string/menu_update_key" />
-            <item
-                android:id="@+id/menu_key_view_export_keyserver"
-                app:showAsAction="never"
-                android:title="@string/menu_export_key_to_server" />
-        </menu>
-    </item>
-
     <item
         android:id="@+id/menu_key_view_export_file"
         android:icon="@drawable/ic_action_import_export"
-- 
cgit v1.2.3