From 9714bcc85b2a2ef9f18d314e85a99abc358fdf2c Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Fri, 26 Aug 2016 00:04:04 +0200
Subject: [PATCH] ImportKeys: Show refresh button and change text for "Show
 key"

---
 .../layout/import_keys_list_item_extra.xml    | 26 ++++++++++++-------
 OpenKeychain/src/main/res/values/strings.xml  |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
index d3a7a02ee..1eddcb500 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item_extra.xml
@@ -103,17 +103,23 @@
 
         </LinearLayout>
 
-        <Button
-            android:id="@+id/import_key"
-            style="@style/CardViewActionButton"
-            android:text="@string/btn_import"
-            android:visibility="@{entry.updated ? V.GONE : V.VISIBLE}" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/show_key"
-            style="@style/CardViewActionButton"
-            android:text="@string/btn_show_key"
-            android:visibility="@{entry.updated ? V.VISIBLE : V.GONE}" />
+            <Button
+                android:id="@+id/import_key"
+                style="@style/CardViewActionButton"
+                android:text="@{entry.updated ? @string/btn_refresh : @string/btn_import}" />
+
+            <Button
+                android:id="@+id/show_key"
+                style="@style/CardViewActionButton"
+                android:text="@string/btn_go_to_key"
+                android:visibility="@{entry.updated ? V.VISIBLE : V.GONE}" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e25b9ada3..095cba063 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -536,7 +536,7 @@
     <string name="btn_import_keys">"Import all keys"</string>
     <string name="btn_view_list">"View list"</string>
     <string name="btn_refresh">"Refresh"</string>
-    <string name="btn_show_key">"Show key"</string>
+    <string name="btn_go_to_key">"Go to key"</string>
 
     <!-- Import from URL -->
     <string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>