NON-WORKING Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	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/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle

1 files changed, 13 insertions, 30 deletions

diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 716a426a0..386a9d46e 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -5,59 +5,42 @@
     <item
         android:id="@+id/menu_key_list_search"
         android:title="@string/menu_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@drawable/ic_search_white_24dp"
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|always" />
 
     <item
-        android:id="@+id/menu_key_list_search_cloud"
-        app:showAsAction="always|withText"
-        android:icon="@drawable/ic_action_search_cloud"
-        android:title="@string/menu_add_keys" />
-
-    <item
-        android:id="@+id/menu_key_list_add"
-        app:showAsAction="always|withText"
-        android:icon="@drawable/ic_action_qr_code"
-        android:title="@string/import_qr_code_button" />
-
-    <item
         android:id="@+id/menu_key_list_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_all_keys" />
+        android:title="@string/menu_export_all_keys"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_create"
-        app:showAsAction="never"
-        android:title="@string/menu_create_key" />
-
-    <item
-        android:id="@+id/menu_key_list_import_existing_key"
-        app:showAsAction="never"
-        android:title="@string/menu_import_existing_key" />
+        android:title="@string/menu_create_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_cons"
-        app:showAsAction="never"
         android:title="Debug / Consolidate"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_read"
-        app:showAsAction="never"
         android:title="Debug / DB restore"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_write"
-        app:showAsAction="never"
         android:title="Debug / DB backup"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_first_time"
-        app:showAsAction="never"
         android:title="Debug / Show first time screen"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
 </menu>