action encrypt to contact in view and multi select

3 files changed, 23 insertions, 2 deletions

diff --git a/OpenPGP-Keychain/res/layout/key_view_activity.xml b/OpenPGP-Keychain/res/layout/key_view_activity.xml
index 326959e97..8c6281d5b 100644
--- a/OpenPGP-Keychain/res/layout/key_view_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_view_activity.xml
@@ -113,4 +113,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:text="@string/section_actions" />
+
+    <Button
+        android:id="@+id/action_encrypt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/key_view_action_encrypt" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/key_list_multi_selection.xml b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
index 64f8564c1..92481e9cb 100644
--- a/OpenPGP-Keychain/res/menu/key_list_multi_selection.xml
+++ b/OpenPGP-Keychain/res/menu/key_list_public_multi.xml
@@ -2,7 +2,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/delete_entry"
+        android:id="@+id/menu_key_list_public_multi_encrypt"
+        android:title="@string/menu_encrypt_to"/>
+    <item
+        android:id="@+id/menu_key_list_public_multi_delete"
         android:icon="@android:drawable/ic_menu_delete"
         android:title="@string/menu_delete_key"/>
 
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index d870c1289..62beb64f7 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -55,6 +55,7 @@
     <string name="section_defaults">Defaults</string>
     <string name="section_advanced">Advanced</string>
     <string name="section_master_key">Master Key</string>
+    <string name="section_actions">Actions</string>
 
     <!-- button -->
     <string name="btn_sign_to_clipboard">Sign (Clipboard)</string>
@@ -102,7 +103,8 @@
     <string name="menu_sign_key">Sign key</string>
     <string name="menu_beam_preferences">Beam settings</string>
     <string name="menu_key_edit_cancel">Cancel</string>
-
+    <string name="menu_encrypt_to">Encrypt to…</string>
+    
     <!-- label -->
     <string name="label_sign">Sign</string>
     <string name="label_message">Message</string>
@@ -357,4 +359,7 @@
         <item quantity="other">%d keys selected.</item>
     </plurals>
 
+    <!-- Key view -->
+    <string name="key_view_action_encrypt">Encrypt to this contact</string>
+
 </resources>
\ No newline at end of file