From a38f84a40169a65bf0eac1e06165a844df9b642c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 21:53:46 +0100
Subject: Dont show verification icons in my key view, hide edit button for
 non-secret keys

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 --------
 OpenKeychain/src/main/res/menu/key_view.xml            | 7 +++++++
 OpenKeychain/src/main/res/values/strings.xml           | 4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 94f0932f4..7dd30c22c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -108,14 +108,6 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_verified_cutout" />
 
-            <ImageButton
-                android:id="@+id/view_key_action_edit"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:visibility="invisible"
-                style="?android:attr/borderlessButtonStyle"
-                android:src="@drawable/ic_mode_edit_white_24dp" />
-
             <ImageButton
                 android:id="@+id/view_key_action_nfc"
                 android:layout_width="64dp"
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index d2ca90942..86f8ea6a2 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,6 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_key_view_edit"
+        android:icon="@drawable/ic_mode_edit_white_24dp"
+        android:visible="false"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_edit" />
+
     <item
         android:id="@+id/menu_key_view_refresh"
         android:icon="@drawable/ic_refresh_white_24dp"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 46d6d3e47..067ce20ea 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="menu_create_key">"Create my key"</string>
     <string name="menu_import_existing_key">"Import from file"</string>
     <string name="menu_search">"Search"</string>
+    <string name="menu_nfc_preferences">"NFC settings"</string>
     <string name="menu_beam_preferences">"Beam settings"</string>
     <string name="menu_key_edit_cancel">"Cancel"</string>
     <string name="menu_encrypt_to">"Encrypt to…"</string>
@@ -272,7 +273,8 @@
 
     <!-- errors without preceeding Error: -->
     <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string>
-    <string name="error_nfc_needed">"NFC is not available on your device!"</string>
+    <string name="error_nfc_needed">"NFC must be enabled!"</string>
+    <string name="error_beam_needed">"Beam must be enabled!"</string>
     <string name="error_nothing_import">"No keys found!"</string>
     <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string>
     <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string>
-- 
cgit v1.2.3