merged dialog

5 files changed, 36 insertions, 21 deletions

diff --git a/OpenKeychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml
index 4b4fc39e8..5ac340550 100644
--- a/OpenKeychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_app_settings.xml
@@ -12,4 +12,9 @@
         android:title="@string/api_settings_revoke"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_api_settings_advanced"
+        android:title="@string/api_settings_advanced"
+        app:showAsAction="never" />
+
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 8a682badc..386a9d46e 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -10,17 +10,6 @@
         app:showAsAction="collapseActionView|always" />
 
     <item
-        android:id="@+id/menu_key_list_search_cloud"
-        android:icon="@drawable/ic_cloud_search_24px"
-        android:title="@string/menu_search_cloud"
-        app:showAsAction="ifRoom|withText" />
-
-    <item
-        android:id="@+id/menu_key_list_add"
-        android:title="@string/import_qr_code_button"
-        app:showAsAction="ifRoom|withText" />
-
-    <item
         android:id="@+id/menu_key_list_export"
         android:title="@string/menu_export_all_keys"
         app:showAsAction="never" />
@@ -31,11 +20,6 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_key_list_import_existing_key"
-        android:title="@string/menu_import_existing_key"
-        app:showAsAction="never" />
-
-    <item
         android:id="@+id/menu_key_list_debug_cons"
         android:title="Debug / Consolidate"
         android:visible="false"
diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml
index 3e0f87692..7fdf4a5c1 100644
--- a/OpenKeychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml
@@ -4,26 +4,23 @@
 
     <item
         android:id="@+id/menu_key_list_multi_encrypt"
-        android:icon="@drawable/ic_action_secure"
+        android:icon="@drawable/ic_lock_white_24dp"
         android:title="@string/menu_encrypt_to" />
 
     <item
         android:id="@+id/menu_key_list_multi_export"
-        android:icon="@drawable/ic_action_import_export"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_export_key" />
 
     <item
         android:id="@+id/menu_key_list_multi_delete"
-        android:icon="@drawable/ic_action_discard"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_delete_key" />
 
     <item
         android:id="@+id/menu_key_list_multi_select_all"
-        android:icon="@drawable/ic_action_select_all"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_select_all" />
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 049c7013a..c724c46a5 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -3,8 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
+        android:id="@+id/menu_key_view_edit"
+        android:icon="@drawable/ic_mode_edit_white_24dp"
+        android:visible="false"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_edit" />
+
+    <item
+        android:id="@+id/menu_key_view_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_update" />
+
+    <item
         android:id="@+id/menu_key_view_export_file"
-        android:icon="@drawable/ic_action_import_export"
         app:showAsAction="never"
         android:title="@string/menu_export_key" />
 
@@ -19,4 +31,10 @@
         app:showAsAction="never"
         android:title="@string/menu_advanced" />
 
+    <item
+        android:id="@+id/menu_key_view_certify_fingerprint"
+        app:showAsAction="never"
+        android:visible="false"
+        android:title="@string/menu_certify_fingerprint" />
+
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_view2.xml b/OpenKeychain/src/main/res/menu/key_view2.xml
new file mode 100644
index 000000000..d928bee36
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/key_view2.xml
@@ -0,0 +1,11 @@
+<?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_view_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_update" />
+
+</menu>
\ No newline at end of file