aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/menu
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-07-31 23:54:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-07-31 23:54:11 +0200
commit08ae9db4eeeecb865943b2b1386b3a845ed4e0fb (patch)
treea424b1ba90a2a7db32650e4af13bb47a29c9293d /OpenKeychain/src/main/res/menu
parent55b764eb1d39a8f07286454cfce952fb459b7a89 (diff)
parentfaf3868f017cae72a7c90a622004fc87bdd1cb5d (diff)
downloadopen-keychain-08ae9db4eeeecb865943b2b1386b3a845ed4e0fb.tar.gz
open-keychain-08ae9db4eeeecb865943b2b1386b3a845ed4e0fb.tar.bz2
open-keychain-08ae9db4eeeecb865943b2b1386b3a845ed4e0fb.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/key_view.xml17
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 64877d725..5a156b5ac 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -3,23 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/menu_key_keyserver"
- android:icon="@drawable/ic_action_cloud"
- app:showAsAction="always"
- android:title="@string/menu_key_server">
- <menu>
- <item
- android:id="@+id/menu_key_view_update"
- app:showAsAction="never"
- android:title="@string/menu_update_key" />
- <item
- android:id="@+id/menu_key_view_export_keyserver"
- app:showAsAction="never"
- android:title="@string/menu_export_key_to_server" />
- </menu>
- </item>
-
- <item
android:id="@+id/menu_key_view_export_file"
android:icon="@drawable/ic_action_import_export"
app:showAsAction="never"