Rework menu items

8 files changed, 14 insertions, 10 deletions

diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png
new file mode 100644
index 000000000..3daa64131
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png
new file mode 100644
index 000000000..266d4c21f
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
new file mode 100644
index 000000000..0769899fd
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
new file mode 100644
index 000000000..f97084dbe
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index b75f4e9a6..9f285388b 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -2,7 +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_list_search"
         android:title="@string/menu_search"
@@ -37,7 +36,6 @@
         android:id="@+id/menu_key_list_export"
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_import_export"
-        android:title="@string/menu_export_keys">
-    </item>
+        android:title="@string/menu_export_all_keys" />
 
 </menu>
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
index 50f83026c..087521177 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
@@ -5,14 +5,17 @@
         android:id="@+id/menu_key_list_multi_export"
         android:icon="@drawable/ic_action_import_export"
         android:title="@string/menu_export_key" />
+
     <item
         android:id="@+id/menu_key_list_multi_encrypt"
         android:icon="@drawable/ic_action_secure"
         android:title="@string/menu_encrypt_to" />
+
     <item
         android:id="@+id/menu_key_list_multi_delete"
         android:icon="@drawable/ic_action_discard"
         android:title="@string/menu_delete_key" />
+
     <item
         android:id="@+id/menu_key_list_multi_select_all"
         android:icon="@drawable/ic_action_select_all"
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
index 105368cbb..2f5697a0f 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_key_view_share"
         android:icon="@drawable/ic_action_share"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:title="@string/menu_share">
         <menu>
             <item
@@ -48,9 +48,10 @@
             </item>
         </menu>
     </item>
+
     <item
         android:id="@+id/menu_key_keyserver"
-        android:icon="@drawable/ic_action_import_export"
+        android:icon="@drawable/ic_action_cloud"
         app:showAsAction="always"
         android:title="@string/menu_key_server">
         <menu>
@@ -64,13 +65,17 @@
                 android:title="@string/menu_export_key_to_server" />
         </menu>
     </item>
+
     <item
         android:id="@+id/menu_key_view_export_file"
-        app:showAsAction="never"
+        android:icon="@drawable/ic_action_import_export"
+        app:showAsAction="ifRoom"
         android:title="@string/menu_export_key" />
+
     <item
         android:id="@+id/menu_key_view_delete"
-        app:showAsAction="never"
+        android:icon="@drawable/ic_action_discard"
+        app:showAsAction="ifRoom"
         android:title="@string/menu_delete_key" />
 
 </menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd280d7b7..a57063441 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -78,8 +78,6 @@
     <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_public_keys">Export all public keys</string>
-    <string name="menu_export_secret_keys">Export all secret keys</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
     <string name="menu_create_key">Create key</string>
@@ -104,7 +102,7 @@
     <string name="menu_encrypt_to">Encrypt to…</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_add_keys">Add keys</string>
-    <string name="menu_export_keys">Export keys</string>
+    <string name="menu_export_all_keys">Export all keys</string>
 
     <!-- label -->
     <string name="label_sign">Sign</string>