diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
| commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
| tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /OpenKeychain/src/main/res/menu/key_view.xml | |
| parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
| parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
| download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu/key_view.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 17 |
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" |