Merge remote-tracking branch 'origin/master' into certs

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

4 files changed, 25 insertions, 50 deletions

diff --git a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
deleted file mode 100644
index f9f7f8f0a..000000000
--- a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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_edit_save"
-        android:icon="@drawable/ic_action_save"
-        app:showAsAction="always"
-        android:title="@string/btn_save">
-    </item>
-    <item
-        android:id="@+id/menu_key_edit_export_file"
-        app:showAsAction="never"
-        android:title="@string/menu_export_key" />
-    <item
-        android:id="@+id/menu_key_edit_delete"
-        app:showAsAction="never"
-        android:title="@string/menu_delete_key" />
-    <item
-        android:id="@+id/menu_key_edit_cancel"
-        app:showAsAction="never"
-        android:title="@string/menu_key_edit_cancel" />
-
-</menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index b75f4e9a6..3f80b616d 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"
@@ -11,33 +10,25 @@
         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"
         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" />
+
+    <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>
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