moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

reorder menu in key view

This commit is contained in:
Dominik Schürmann 2014-01-03 18:33:44 +01:00
parent 0e4cfed969
commit 28d9a2f26b
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
OpenPGP-Keychain/res/menu/key_view.xml
View File

@ -2,37 +2,55 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menu_key_view_update"
android:showAsAction="ifRoom"
android:title="@string/menu_update_key"/>
android:id="@+id/menu_key_view_share"
android:icon="@android:drawable/ic_menu_share"
android:showAsAction="always"
android:title="@string/menu_share">
<menu>
<item
android:id="@+id/menu_key_view_share_default"
android:showAsAction="never"
android:title="@string/menu_share"/>
<item
android:id="@+id/menu_key_view_share_qr_code"
android:showAsAction="never"
android:title="@string/menu_share_qr_code"/>
<item
android:id="@+id/menu_key_view_share_nfc"
android:showAsAction="never"
android:title="@string/menu_share_nfc"/>
</menu>
</item>
<item
android:id="@+id/menu_key_keyserver"
android:icon="@android:drawable/ic_menu_upload"
android:showAsAction="always"
android:title="@string/menu_share">
<menu>
<item
android:id="@+id/menu_key_view_update"
android:showAsAction="never"
android:title="@string/menu_update_key"/>
<item
android:id="@+id/menu_key_view_export_keyserver"
android:showAsAction="never"
android:title="@string/menu_export_key_to_server"/>
</menu>
</item>
<item
android:id="@+id/menu_key_view_sign"
android:showAsAction="never"
android:title="@string/menu_sign_key"/>
<item
android:id="@+id/menu_key_view_export_keyserver"
android:showAsAction="never"
android:title="@string/menu_export_key_to_server"/>
<item
android:id="@+id/menu_key_view_export_file"
android:showAsAction="never"
android:title="@string/menu_export_key"/>
<item
android:id="@+id/menu_key_view_share"
android:showAsAction="never"
android:title="@string/menu_share"/>
<item
android:id="@+id/menu_key_view_share_qr_code"
android:showAsAction="never"
android:title="@string/menu_share_qr_code"/>
<item
android:id="@+id/menu_key_view_share_nfc"
android:showAsAction="never"
android:title="@string/menu_share_nfc"/>
<item
android:id="@+id/menu_key_view_delete"
android:showAsAction="never"
android:title="@string/menu_delete_key"/>
android:title="@string/menu_delete_key">
<menu>
</menu>
</item>
</menu>

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
View File

@ -165,7 +165,7 @@ public class KeyViewActivity extends SherlockFragmentActivity implements CreateN
//
// mKeyListActivity.showExportKeysDialog(masterKeyId);
return true;
case R.id.menu_key_view_share:
case R.id.menu_key_view_share_default:
shareKey();
return true;
case R.id.menu_key_view_share_qr_code: