aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-05 23:40:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-05 23:40:11 +0200
commitd0c6971273f76ce0766f90ea9fb6dacbeb5dd3a5 (patch)
treef73d0ab4c738a64244af8eb2c9fbddc3fa0d2d28 /OpenPGP-Keychain/src/main/res
parent49bf040dae15b9d52245fe2313ff610ddc8448c3 (diff)
downloadopen-keychain-d0c6971273f76ce0766f90ea9fb6dacbeb5dd3a5.tar.gz
open-keychain-d0c6971273f76ce0766f90ea9fb6dacbeb5dd3a5.tar.bz2
open-keychain-d0c6971273f76ce0766f90ea9fb6dacbeb5dd3a5.zip
Remove import activity from drawer, make it reachable from key list only
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r--OpenPGP-Keychain/src/main/res/menu/key_list.xml31
1 files changed, 12 insertions, 19 deletions
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index 9f285388b..3f80b616d 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -10,27 +10,10 @@
app:showAsAction="collapseActionView|ifRoom" />
<item
- android:id="@+id/menu_key_list_add"
+ android:id="@+id/menu_key_list_import"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_add_person"
- android:title="@string/menu_add_keys">
- <menu>
- <item
- android:id="@+id/menu_key_list_import"
- app:showAsAction="never"
- android:title="@string/menu_import" />
-
- <item
- android:id="@+id/menu_key_list_create"
- app:showAsAction="never"
- android:title="@string/menu_create_key" />
-
- <item
- android:id="@+id/menu_key_list_create_expert"
- app:showAsAction="never"
- android:title="@string/menu_create_key_expert" />
- </menu>
- </item>
+ android:title="@string/menu_add_keys" />
<item
android:id="@+id/menu_key_list_export"
@@ -38,4 +21,14 @@
android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_all_keys" />
+ <item
+ android:id="@+id/menu_key_list_create"
+ app:showAsAction="never"
+ android:title="@string/menu_create_key" />
+
+ <item
+ android:id="@+id/menu_key_list_create_expert"
+ app:showAsAction="never"
+ android:title="@string/menu_create_key_expert" />
+
</menu>