UI stuff

7 files changed, 9 insertions, 35 deletions

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search_cloud.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search_cloud.png
new file mode 100644
index 000000000..ba7236da3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search_cloud.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search_cloud.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search_cloud.png
new file mode 100644
index 000000000..e1067f73c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search_cloud.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search_cloud.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search_cloud.png
new file mode 100644
index 000000000..b81772f20
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search_cloud.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search_cloud.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search_cloud.png
new file mode 100644
index 000000000..7c8b36bc0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search_cloud.png
diff --git a/OpenKeychain/src/main/res/layout/add_keys_activity.xml b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
index eee561390..a5f5dd71a 100644
--- a/OpenKeychain/src/main/res/layout/add_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
@@ -135,34 +135,6 @@
                 android:background="?android:attr/listDivider"
                 android:layout_marginBottom="8dp" />
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/add_keys_section_import" />
-
-            <TextView
-                android:id="@+id/add_keys_search_cloud"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:clickable="true"
-                style="@style/SelectableItem"
-                android:text="@string/add_keys_cloud"
-                android:drawableRight="@drawable/ic_action_search"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_marginBottom="8dp" />
-
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 27d96d7d7..3e7d6fc9f 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -7,18 +7,23 @@
         android:title="@string/menu_search"
         android:icon="@drawable/ic_action_search"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="collapseActionView|ifRoom" />
+        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="ifRoom|withText"
+        app:showAsAction="always|withText"
         android:icon="@drawable/ic_action_new_account"
         android:title="@string/menu_add_keys" />
 
     <item
         android:id="@+id/menu_key_list_export"
-        app:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_action_import_export"
+        app:showAsAction="never"
         android:title="@string/menu_export_all_keys" />
 
     <item
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index eaac43f7e..3454988c0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -277,13 +277,10 @@
     <!-- Add keys -->
     <string name="add_keys_section_secure_exchange">"Secure Exchange"</string>
     <string name="add_keys_section_secure_add">"Secure Add"</string>
-    <string name="add_keys_section_import">"Import (untrusted)"</string>
     <string name="add_keys_my_key">"My key:"</string>
     <string name="add_keys_start_exchange">"Start exchange"</string>
     <string name="add_keys_qr_code">"Scan QR Code"</string>
     <string name="add_keys_nfc">"Receive via NFC"</string>
-    <string name="add_keys_cloud">"Search cloud"</string>
-
 
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">"Done."</string>