Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file

6 files changed, 7 insertions, 44 deletions

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
index 96271d418..ceea1d8a6 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
-            android:src="@drawable/icon" />
+            android:src="@drawable/ic_launcher" />
 
         <TextView
             android:id="@+id/api_app_settings_app_name"
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index e70a79589..543f7d675 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -11,7 +11,7 @@
         android:layout_height="48dp"
         android:layout_marginLeft="8dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/icon" />
+        android:src="@drawable/ic_launcher" />
 
     <TextView
         android:id="@+id/api_apps_adapter_item_name"
diff --git a/OpenKeychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
index 71788e720..6afab2e12 100644
--- a/OpenKeychain/src/main/res/layout/help_about_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
@@ -28,7 +28,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:layout_marginRight="10dp"
-                    android:src="@drawable/icon" />
+                    android:src="@drawable/ic_launcher" />
             </LinearLayout>
 
             <LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
index bf00b77e7..062289688 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
@@ -18,22 +18,13 @@
         android:lines="1"
         android:maxLines="1"
         android:minLines="1"
-        android:layout_marginRight="8dp"
         android:layout_gravity="center_vertical" />
 
-    <View
-        android:layout_width="1dip"
-        android:layout_height="match_parent"
-        android:gravity="right"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:background="?android:attr/listDivider" />
-
     <ImageButton
         android:id="@+id/import_keybase_search"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:padding="16dp"
+        android:padding="8dp"
         android:src="@drawable/ic_action_search"
         android:layout_gravity="center_vertical"
         style="@style/SelectableItem" />
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 09a31b4a8..1cc414dab 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -33,34 +33,15 @@
             android:layout_marginTop="8dp"
             android:background="?android:attr/listDivider" />
 
-        <Button
+        <ImageButton
             android:id="@+id/import_nfc_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:text="NFC?"
+            android:src="@drawable/ic_action_nfc"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/import_qrcode_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="8dp"
-        android:visibility="gone" />
-
-    <ProgressBar
-        android:id="@+id/import_qrcode_progress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:progress="0"
-        android:visibility="gone" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index 7562eaa9b..47c354c53 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
@@ -23,22 +23,13 @@
             android:lines="1"
             android:maxLines="1"
             android:minLines="1"
-            android:layout_marginRight="8dp"
             android:layout_gravity="center_vertical" />
 
-        <View
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:gravity="right"
-            android:layout_marginBottom="8dp"
-            android:layout_marginTop="8dp"
-            android:background="?android:attr/listDivider" />
-
         <ImageButton
             android:id="@+id/import_server_search"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:padding="16dp"
+            android:padding="8dp"
             android:src="@drawable/ic_action_search"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />