From d8001f9bbd83207922903f6a99872be5c2bac659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 1 Apr 2014 19:31:36 +0200
Subject: Menu cleanup

---
 .../keychain/ui/KeyListActivity.java               |  9 ++--
 OpenPGP-Keychain/src/main/res/menu/key_list.xml    | 52 ++++++++++++++--------
 .../src/main/res/menu/key_list_multi.xml           |  8 ++--
 OpenPGP-Keychain/src/main/res/values/strings.xml   |  6 ++-
 4 files changed, 47 insertions(+), 28 deletions(-)

(limited to 'OpenPGP-Keychain/src')

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 06df6f12d..27d3bbbb0 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
@@ -55,10 +56,6 @@ public class KeyListActivity extends DrawerActivity {
             case R.id.menu_key_list_import:
                 callIntentForDrawerItem(Constants.DrawerItems.IMPORT_KEYS);
 
-                return true;
-            case R.id.menu_key_list_export:
-                mExportHelper.showExportKeysDialog(null, Id.type.public_key, Constants.Path.APP_DIR_FILE_PUB, null);
-
                 return true;
             case R.id.menu_key_list_create:
                 createKey();
@@ -67,6 +64,10 @@ public class KeyListActivity extends DrawerActivity {
             case R.id.menu_key_list_create_expert:
                 createKeyExpert();
 
+                return true;
+            case R.id.menu_key_list_export_public:
+                mExportHelper.showExportKeysDialog(null, Id.type.public_key, Constants.Path.APP_DIR_FILE_PUB, null);
+
                 return true;
             case R.id.menu_key_list_secret_export:
                 mExportHelper.showExportKeysDialog(null, Id.type.secret_key, Constants.Path.APP_DIR_FILE_SEC, null);
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index 10223522c..bcb2a4b99 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -2,11 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_key_list_import"
-        app:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_action_add_person"
-        android:title="@string/menu_import" />
 
     <item
         android:id="@+id/menu_key_list_search"
@@ -16,23 +11,44 @@
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
-        android:id="@+id/menu_key_list_create"
-        app:showAsAction="never"
-        android:title="@string/menu_create_key" />
+        android:id="@+id/menu_key_list_add"
+        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_expert"
-        app:showAsAction="never"
-        android:title="@string/menu_create_key_expert" />
+            <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>
 
     <item
         android:id="@+id/menu_key_list_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_keys" />
+        app:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_action_import_export"
+        android:title="@string/menu_export_keys">
+        <menu>
+            <item
+                android:id="@+id/menu_key_list_export_public"
+                app:showAsAction="never"
+                android:title="@string/menu_export_public_keys" />
 
-    <item
-        android:id="@+id/menu_key_list_secret_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_secret_keys" />
+            <item
+                android:id="@+id/menu_key_list_secret_export"
+                app:showAsAction="never"
+                android:title="@string/menu_export_secret_keys" />
+        </menu>
+    </item>
 
 </menu>
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
index db709052f..50f83026c 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/menu_key_list_multi_select_all"
-        android:icon="@drawable/ic_action_select_all"
-        android:title="@string/menu_select_all" />
     <item
         android:id="@+id/menu_key_list_multi_export"
         android:icon="@drawable/ic_action_import_export"
@@ -17,5 +13,9 @@
         android:id="@+id/menu_key_list_multi_delete"
         android:icon="@drawable/ic_action_discard"
         android:title="@string/menu_delete_key" />
+    <item
+        android:id="@+id/menu_key_list_multi_select_all"
+        android:icon="@drawable/ic_action_select_all"
+        android:title="@string/menu_select_all" />
 
 </menu>
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 645d7941a..c9ef6a135 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -78,7 +78,7 @@
     <string name="menu_import_from_qr_code">Import from QR Code</string>
     <string name="menu_import">Import</string>
     <string name="menu_import_from_nfc">Import from NFC</string>
-    <string name="menu_export_keys">Export all keys</string>
+    <string name="menu_export_public_keys">Export all public keys</string>
     <string name="menu_export_secret_keys">Export all secret keys</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
@@ -103,6 +103,8 @@
     <string name="menu_key_edit_cancel">Cancel</string>
     <string name="menu_encrypt_to">Encrypt to…</string>
     <string name="menu_select_all">Select all</string>
+    <string name="menu_add_keys">Add keys</string>
+    <string name="menu_export_keys">Export keys</string>
 
     <!-- label -->
     <string name="label_sign">Sign</string>
@@ -469,7 +471,7 @@
     <string name="key_view_tab_certs">Certifications</string>
 
     <!-- Navigation Drawer -->
-    <string name="nav_contacts">Contacts</string>
+    <string name="nav_contacts">Keys</string>
     <string name="nav_encrypt">Sign and Encrypt</string>
     <string name="nav_decrypt">Decrypt and Verify</string>
     <string name="nav_import">Import Keys</string>
-- 
cgit v1.2.3