From 00e97586b06e5e61f6639b75423f9ec3edba47a0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 14 Nov 2015 03:24:07 +0100
Subject: inline subkey editing (wip commit)

---
 OpenKeychain/src/main/res/menu/edit_subkeys.xml | 12 ++++++++++++
 OpenKeychain/src/main/res/menu/edit_user_id.xml |  2 +-
 OpenKeychain/src/main/res/menu/key_view.xml     |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/menu/edit_subkeys.xml

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/edit_subkeys.xml b/OpenKeychain/src/main/res/menu/edit_subkeys.xml
new file mode 100644
index 000000000..f9f75ebbb
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/edit_subkeys.xml
@@ -0,0 +1,12 @@
+<?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_edit_subkeys"
+        android:icon="@drawable/ic_mode_edit_white_24dp"
+        android:title="@string/key_view_action_edit_subkeys"
+        app:showAsAction="always"
+        />
+
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/edit_user_id.xml b/OpenKeychain/src/main/res/menu/edit_user_id.xml
index d1f856fd2..617dae841 100644
--- a/OpenKeychain/src/main/res/menu/edit_user_id.xml
+++ b/OpenKeychain/src/main/res/menu/edit_user_id.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_edit_user_ids"
         android:icon="@drawable/ic_mode_edit_white_24dp"
-        android:title="@string/key_view_action_edit"
+        android:title="@string/key_view_action_edit_ids"
         app:showAsAction="always"
         />
 
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index c0adfcd6f..a3de4efed 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -7,7 +7,7 @@
         android:icon="@drawable/ic_mode_edit_white_24dp"
         android:visible="false"
         app:showAsAction="always"
-        android:title="@string/key_view_action_edit" />
+        android:title="@string/key_view_action_edit_ids" />
 
     <item
         android:id="@+id/menu_key_view_refresh"
-- 
cgit v1.2.3