From 0aaa93ac041eeb738b38b34e579cc51b613ca6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 28 Aug 2015 11:49:47 +0200
Subject: [PATCH] Dont show FAB for expired, revoked keys

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 4 +++-
 OpenKeychain/src/main/res/values/strings.xml           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 89e88fdcf..f27938148 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -190,7 +190,9 @@
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
         android:src="@drawable/ic_qrcode_white_24dp"
+        android:visibility="invisible"
         app:layout_anchor="@id/app_bar_layout"
-        app:layout_anchorGravity="bottom|right|end" />
+        app:layout_anchorGravity="bottom|right|end"
+        tools:visibility="visible" />
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f810f4bf8..c762b8729 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -114,7 +114,7 @@
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_update_all_keys">"Update all keys"</string>
     <string name="menu_advanced">"Extended information"</string>
-    <string name="menu_certify_fingerprint">"Confirm via fingerprints"</string>
+    <string name="menu_certify_fingerprint">"Confirm via fingerprint"</string>
     <string name="menu_certify_fingerprint_word">"Confirm via words"</string>
     <string name="menu_export_log">"Export Log"</string>