From 28d9a2f26b71158823d73451bf25e1f5cf0c5431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 3 Jan 2014 18:33:44 +0100
Subject: [PATCH] reorder menu in key view

---
 OpenPGP-Keychain/res/menu/key_view.xml        | 60 ++++++++++++-------
 .../keychain/ui/KeyViewActivity.java          |  2 +-
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/OpenPGP-Keychain/res/menu/key_view.xml b/OpenPGP-Keychain/res/menu/key_view.xml
index ac5c96c5d..0785abd32 100644
--- a/OpenPGP-Keychain/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/res/menu/key_view.xml
@@ -2,37 +2,55 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/menu_key_view_update"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_update_key"/>
+        android:id="@+id/menu_key_view_share"
+        android:icon="@android:drawable/ic_menu_share"
+        android:showAsAction="always"
+        android:title="@string/menu_share">
+        <menu>
+            <item
+                android:id="@+id/menu_key_view_share_default"
+                android:showAsAction="never"
+                android:title="@string/menu_share"/>
+            <item
+                android:id="@+id/menu_key_view_share_qr_code"
+                android:showAsAction="never"
+                android:title="@string/menu_share_qr_code"/>
+            <item
+                android:id="@+id/menu_key_view_share_nfc"
+                android:showAsAction="never"
+                android:title="@string/menu_share_nfc"/>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/menu_key_keyserver"
+        android:icon="@android:drawable/ic_menu_upload"
+        android:showAsAction="always"
+        android:title="@string/menu_share">
+        <menu>
+            <item
+                android:id="@+id/menu_key_view_update"
+                android:showAsAction="never"
+                android:title="@string/menu_update_key"/>
+            <item
+                android:id="@+id/menu_key_view_export_keyserver"
+                android:showAsAction="never"
+                android:title="@string/menu_export_key_to_server"/>
+        </menu>
+    </item>
     <item
         android:id="@+id/menu_key_view_sign"
         android:showAsAction="never"
         android:title="@string/menu_sign_key"/>
-    <item
-        android:id="@+id/menu_key_view_export_keyserver"
-        android:showAsAction="never"
-        android:title="@string/menu_export_key_to_server"/>
     <item
         android:id="@+id/menu_key_view_export_file"
         android:showAsAction="never"
         android:title="@string/menu_export_key"/>
-    <item
-        android:id="@+id/menu_key_view_share"
-        android:showAsAction="never"
-        android:title="@string/menu_share"/>
-    <item
-        android:id="@+id/menu_key_view_share_qr_code"
-        android:showAsAction="never"
-        android:title="@string/menu_share_qr_code"/>
-    <item
-        android:id="@+id/menu_key_view_share_nfc"
-        android:showAsAction="never"
-        android:title="@string/menu_share_nfc"/>
-    
     <item
         android:id="@+id/menu_key_view_delete"
         android:showAsAction="never"
-        android:title="@string/menu_delete_key"/>
+        android:title="@string/menu_delete_key">
+        <menu>
+        </menu>
+    </item>
 
 </menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
index ad63f022d..45c79fc8e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
@@ -165,7 +165,7 @@ public class KeyViewActivity extends SherlockFragmentActivity implements CreateN
             //
             // mKeyListActivity.showExportKeysDialog(masterKeyId);
             return true;
-        case R.id.menu_key_view_share:
+        case R.id.menu_key_view_share_default:
             shareKey();
             return true;
         case R.id.menu_key_view_share_qr_code: