Merge branch 'development' of github.com:open-keychain/open-keychain into development

3 files changed, 19 insertions, 12 deletions

diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index b6cbfd973..c7fa882cb 100644
--- a/OpenKeychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
@@ -24,21 +24,21 @@
         android:layout_gravity="center_vertical">
 
         <TextView
-            android:id="@+id/mainUserId"
+            android:id="@+id/select_key_item_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Alice"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/mainUserIdRest"
+            android:id="@+id/select_key_item_email"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="alice@example.com"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/subkey_item_key_id"
+            android:id="@+id/select_key_item_key_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0xBBBBBBBBBBBBBBB"
@@ -46,7 +46,7 @@
     </LinearLayout>
 
     <ImageView
-        android:id="@+id/status_icon"
+        android:id="@+id/select_key_item_status_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml
index 087521177..3e0f87692 100644
--- a/OpenKeychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_key_list_multi_export"
-        android:icon="@drawable/ic_action_import_export"
-        android:title="@string/menu_export_key" />
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/menu_key_list_multi_encrypt"
@@ -12,13 +8,24 @@
         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" />
 
 </menu>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d914b4299..2d7778927 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -89,7 +89,7 @@
     <string name="menu_export_key">"Export to file"</string>
     <string name="menu_delete_key">"Delete key"</string>
     <string name="menu_create_key">"Create my key"</string>
-    <string name="menu_import_existing_key">"Import existing key"</string>
+    <string name="menu_import_existing_key">"Import from file"</string>
     <string name="menu_search">"Search"</string>
     <string name="menu_beam_preferences">"Beam settings"</string>
     <string name="menu_key_edit_cancel">"Cancel"</string>
@@ -1045,7 +1045,7 @@
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
     <string name="first_time_create_key">"Create my key"</string>
-    <string name="first_time_import_key">"Import existing key"</string>
+    <string name="first_time_import_key">"Import from file"</string>
     <string name="first_time_skip">"Skip Setup"</string>
 
 </resources>