diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 13:40:47 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 13:40:47 +0100 |
| commit | 9a1ce093bfadd9de33397f15c39a4c6f52a4abd6 (patch) | |
| tree | daae15efacae7820d94388e7a5976d7d0eed8348 /OpenPGP-Keychain/src/main/res/menu/key_view.xml | |
| parent | 6af65a2a9b5f90b90bf8752820f40f89241d8014 (diff) | |
| parent | f5c50c3896fa0f406ce4b90a9470395eaf6784a4 (diff) | |
| download | open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.tar.gz open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.tar.bz2 open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/menu/key_view.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_view.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml index 59247221a..cd84cc91a 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml @@ -5,7 +5,7 @@ <item android:id="@+id/menu_key_view_share" android:icon="@drawable/ic_action_share" - app:showAsAction="always" + app:showAsAction="ifRoom" android:title="@string/menu_share"> <menu> <item |