aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/menu
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-04 20:54:11 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-04 20:54:11 +0100
commitbb2d80bfc8bae8526692fb6156c8d5b3e7873f4e (patch)
treee325bbcb7b24a5144f821bb11e9bd9120edfedf0 /OpenKeychain/src/main/res/menu
parente312b0e675fcd81b19b95453f04b55aee927b1f3 (diff)
parent024ba19499f6975e2e153ca496d94cb5124f5dd8 (diff)
downloadopen-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.gz
open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.tar.bz2
open-keychain-bb2d80bfc8bae8526692fb6156c8d5b3e7873f4e.zip
Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
Conflicts: OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
-rw-r--r--OpenKeychain/src/main/res/menu/log_display.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/log_display.xml b/OpenKeychain/src/main/res/menu/log_display.xml
new file mode 100644
index 000000000..03af3c5ad
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/log_display.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_log_display_export_log"
+ android:icon="@drawable/ic_action_save_white"
+ android:title="@string/menu_export_log"
+ app:showAsAction="ifRoom|withText" />
+
+</menu>