diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
commit | 2f95100d88954db389cba8e615390795d121c1c8 (patch) | |
tree | 1bf4ffb29bb83fac33ba2ed7c84fb1d6a8af2bd4 /OpenKeychain/src/main/res/menu/key_view.xml | |
parent | 90ac60b6db0637fbefbce5cb2cd80a64f5bb708d (diff) | |
parent | 638554f2560b3c5fd36ca9b4ba205cb5a999b84b (diff) | |
download | open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.gz open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.bz2 open-keychain-2f95100d88954db389cba8e615390795d121c1c8.zip |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/menu/key_view.xml')
-rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 2f5697a0f..864016801 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -3,53 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_key_view_share" - android:icon="@drawable/ic_action_share" - app:showAsAction="always" - android:title="@string/menu_share"> - <menu> - <item - android:id="@+id/menu_key_view_share_fingerprint_title" - app:showAsAction="never" - android:title="@string/menu_share_title_fingerprint"> - <menu> - <item - android:id="@+id/menu_key_view_share_default_fingerprint" - app:showAsAction="never" - android:title="@string/menu_share_default_fingerprint" /> - <item - android:id="@+id/menu_key_view_share_qr_code_fingerprint" - app:showAsAction="never" - android:title="@string/menu_share_qr_code_fingerprint" /> - </menu> - </item> - <item - android:id="@+id/menu_key_view_share_title" - app:showAsAction="never" - android:title="@string/menu_share_title"> - <menu> - <item - android:id="@+id/menu_key_view_share_default" - app:showAsAction="never" - android:title="@string/menu_share_default" /> - <item - android:id="@+id/menu_key_view_share_qr_code" - app:showAsAction="never" - android:title="@string/menu_share_qr_code" /> - <item - android:id="@+id/menu_key_view_share_nfc" - app:showAsAction="never" - android:title="@string/menu_share_nfc" /> - <item - android:id="@+id/menu_key_view_share_clipboard" - app:showAsAction="never" - android:title="@string/menu_copy_to_clipboard" /> - </menu> - </item> - </menu> - </item> - - <item android:id="@+id/menu_key_keyserver" android:icon="@drawable/ic_action_cloud" app:showAsAction="always" @@ -69,13 +22,13 @@ <item android:id="@+id/menu_key_view_export_file" android:icon="@drawable/ic_action_import_export" - app:showAsAction="ifRoom" + app:showAsAction="never" android:title="@string/menu_export_key" /> <item android:id="@+id/menu_key_view_delete" android:icon="@drawable/ic_action_discard" - app:showAsAction="ifRoom" + app:showAsAction="never" android:title="@string/menu_delete_key" /> </menu>
\ No newline at end of file |