aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/menu
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-11-04 20:24:11 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-11-04 20:24:11 +0100
commit3ca8af060b2f6452df794a8770714d1f02b36734 (patch)
tree438d92f9107bd76e10c5f72f41c4d7bc12e44ced /OpenKeychain/src/main/res/menu
parenta4518c43c2fdff3852668242978a8b9739447d0b (diff)
parent31a45759ccfbca76f89e6e51bf94c4a3af3a874f (diff)
downloadopen-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.gz
open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.tar.bz2
open-keychain-3ca8af060b2f6452df794a8770714d1f02b36734.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
-rw-r--r--OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
index 80b78457d..4d3d53870 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
@@ -3,6 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
+ android:id="@+id/encrypt_paste"
+ android:title="@string/btn_paste_encrypted_signed"
+ android:icon="@drawable/ic_action_encrypt_paste_24dp"
+ android:orderInCategory="1"
+ android:visible="false"
+ app:showAsAction="ifRoom" />
+
+ <item
android:id="@+id/encrypt_copy"
android:title="@string/btn_copy_encrypted_signed"
android:icon="@drawable/ic_action_encrypt_copy_24dp"