From ad9c35f522645ccf551767bf4bbc15d7b73d48ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 15 Mar 2015 22:05:12 +0100
Subject: Allow selection of none in SelectSignKeyIdActivity

---
 .../res/layout/api_select_sign_key_activity.xml    | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml b/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml
index 0528fc11e..981e01dd1 100644
--- a/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml
@@ -35,6 +35,28 @@
                     android:text="@string/api_select_sign_key_text"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+                <TextView
+                    android:id="@+id/api_select_sign_key_none"
+                    android:background="?android:selectableItemBackground"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="match_parent"
+                    android:text="@string/none"
+                    android:layout_height="?android:attr/listPreferredItemHeight"
+                    android:gravity="center_vertical"
+                    android:clickable="true" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
                 <FrameLayout
                     android:id="@+id/api_select_sign_key_list_fragment"
                     android:layout_width="match_parent"
-- 
cgit v1.2.3


From 146fa8d6c0ace2f9560341171a491e9ddb0361ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 15:05:39 +0100
Subject: Clarify certification help screen

---
 OpenKeychain/src/main/res/raw/help_certification.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/raw/help_certification.html b/OpenKeychain/src/main/res/raw/help_certification.html
index 8228a4ac1..d4aff1ad7 100644
--- a/OpenKeychain/src/main/res/raw/help_certification.html
+++ b/OpenKeychain/src/main/res/raw/help_certification.html
@@ -22,10 +22,10 @@ To confirm keys between more than two persons, we suggest to use the key exchang
 This certification is a <a href="http://tools.ietf.org/html/rfc4880#section-5.2.1">"generic certification (0x10)"</a> described in the standard by:
 "The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."</p>
 
-<p>Traditionally, certifications (often with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
+<p>Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
 Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
 We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
-We also do not implement (potentially transitive) trust signatures or any other internal trust model.
+We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
 Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.</p>
 
 </body>
-- 
cgit v1.2.3


From a5271bf2297fc49474b5f1ab2755fb073cb7f3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 17:00:53 +0100
Subject: Allow encrypt of filenames via overflow menu

---
 .../src/main/res/menu/encrypt_file_activity.xml        | 18 ++++++++++++++----
 .../src/main/res/menu/encrypt_text_activity.xml        |  1 +
 OpenKeychain/src/main/res/values/strings.xml           |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index f4aeb76c9..1dd9896bc 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -18,17 +18,27 @@
         android:id="@+id/check_use_symmetric"
         android:title="@string/label_symmetric"
         android:checkable="true" />
-    <item
-        android:id="@+id/check_use_armor"
-        android:title="@string/label_file_ascii_armor"
-        android:checkable="true" />
+
     <item
         android:id="@+id/check_delete_after_encrypt"
         android:title="@string/label_delete_after_encryption"
         android:checkable="true" />
+
     <item
         android:id="@+id/check_enable_compression"
         android:title="@string/label_enable_compression"
         android:checked="true"
         android:checkable="true" />
+
+    <item
+        android:id="@+id/encrypt_filenames"
+        android:title="@string/label_encrypt_filenames"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_use_armor"
+        android:title="@string/label_file_ascii_armor"
+        android:checkable="true" />
+    
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index bb9f4058a..408b70822 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -18,6 +18,7 @@
         android:id="@+id/check_use_symmetric"
         android:title="@string/label_symmetric"
         android:checkable="true" />
+
     <item
         android:id="@+id/check_enable_compression"
         android:title="@string/label_enable_compression"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0affa9073..48d58d7b1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -141,7 +141,7 @@
     <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string>
     <string name="label_asymmetric_from">"Signed by:"</string>
     <string name="label_to">"Encrypt to:"</string>
-    <string name="label_delete_after_encryption">"Delete file after encryption"</string>
+    <string name="label_delete_after_encryption">"Delete files after encryption"</string>
     <string name="label_delete_after_decryption">"Delete after decryption"</string>
     <string name="label_encryption_algorithm">"Encryption algorithm"</string>
     <string name="label_hash_algorithm">"Hash algorithm"</string>
@@ -167,6 +167,7 @@
     <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string>
     <string name="label_preferred">"preferred"</string>
     <string name="label_enable_compression">"Enable compression"</string>
+    <string name="label_encrypt_filenames">"Encrypt filenames"</string>
 
     <string name="user_id_no_name">"&lt;no name&gt;"</string>
     <string name="none">"&lt;none&gt;"</string>
-- 
cgit v1.2.3


From fd8f5ebb2fb9c3ee1e66432b9537b2cb421269de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 18:20:44 +0100
Subject: Allow for hidden recipients in encrypt methods

---
 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml | 10 ++++++++--
 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml |  7 +++++++
 OpenKeychain/src/main/res/values/strings.xml             |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index 1dd9896bc..2c5e9d738 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -31,7 +31,7 @@
         android:checkable="true" />
 
     <item
-        android:id="@+id/encrypt_filenames"
+        android:id="@+id/check_encrypt_filenames"
         android:title="@string/label_encrypt_filenames"
         android:checked="true"
         android:checkable="true" />
@@ -40,5 +40,11 @@
         android:id="@+id/check_use_armor"
         android:title="@string/label_file_ascii_armor"
         android:checkable="true" />
-    
+
+    <item
+        android:id="@+id/check_hidden_recipients"
+        android:title="@string/label_hidden_recipients"
+        android:checked="false"
+        android:checkable="true" />
+
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index 408b70822..33862b730 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -24,4 +24,11 @@
         android:title="@string/label_enable_compression"
         android:checked="true"
         android:checkable="true" />
+
+    <item
+        android:id="@+id/check_hidden_recipients"
+        android:title="@string/label_hidden_recipients"
+        android:checked="false"
+        android:checkable="true" />
+
 </menu>
\ 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 48d58d7b1..f1c14bd32 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -168,6 +168,7 @@
     <string name="label_preferred">"preferred"</string>
     <string name="label_enable_compression">"Enable compression"</string>
     <string name="label_encrypt_filenames">"Encrypt filenames"</string>
+    <string name="label_hidden_recipients">"Hide recipients"</string>
 
     <string name="user_id_no_name">"&lt;no name&gt;"</string>
     <string name="none">"&lt;none&gt;"</string>
-- 
cgit v1.2.3


From 025eaf075708c939497c2e6ad85b368efeee4a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 16 Mar 2015 20:34:27 +0100
Subject: Disable hidden recipients for now

---
 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml | 10 +++++-----
 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
index 2c5e9d738..d6ed726fa 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
@@ -41,10 +41,10 @@
         android:title="@string/label_file_ascii_armor"
         android:checkable="true" />
 
-    <item
-        android:id="@+id/check_hidden_recipients"
-        android:title="@string/label_hidden_recipients"
-        android:checked="false"
-        android:checkable="true" />
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
 
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
index 33862b730..5a262fdd8 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
@@ -25,10 +25,10 @@
         android:checked="true"
         android:checkable="true" />
 
-    <item
-        android:id="@+id/check_hidden_recipients"
-        android:title="@string/label_hidden_recipients"
-        android:checked="false"
-        android:checkable="true" />
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 98817d13ee2e33b92f3a339df312709be027e964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 19 Mar 2015 17:16:23 +0100
Subject: Manage my keys wizard

---
 .../main/res/layout/create_key_name_fragment.xml   |   4 +-
 .../main/res/layout/create_key_start_fragment.xml  | 104 ++++++++++++++++
 .../src/main/res/layout/first_time_activity.xml    | 137 ---------------------
 OpenKeychain/src/main/res/menu/key_list.xml        |   2 +-
 OpenKeychain/src/main/res/values-cs/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-de/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-es/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-eu/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-fi/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-fr/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-it/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-ja/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-nl/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-pl/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-ru/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-sl/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-sr/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-sv/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-tr/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values-uk/strings.xml    |   2 +-
 .../src/main/res/values-zh-rTW/strings.xml         |   2 +-
 OpenKeychain/src/main/res/values-zh/strings.xml    |   2 +-
 OpenKeychain/src/main/res/values/strings.xml       |   8 +-
 23 files changed, 131 insertions(+), 160 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/first_time_activity.xml

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
index ea064b00c..a2f81f74c 100644
--- a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
@@ -56,11 +56,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:text="@string/btn_back"
             android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="left|center_vertical"
-            android:clickable="false"
+            android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
 
         <TextView
diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
new file mode 100644
index 000000000..79ffe58b1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_above="@+id/create_key_buttons">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:adjustViewBounds="true"
+            android:src="@drawable/first_time_1"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:background="@color/holo_gray_bright"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/create_key_create_key_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/first_time_create_key"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <!--<TextView-->
+            <!--android:id="@+id/create_key_yubikey_button"-->
+            <!--android:paddingLeft="16dp"-->
+            <!--android:paddingRight="16dp"-->
+            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_weight="1"-->
+            <!--android:text="@string/first_time_yubikey"-->
+            <!--android:textAllCaps="true"-->
+            <!--android:minHeight="?android:attr/listPreferredItemHeight"-->
+            <!--android:drawableRight="@drawable/ic_chevron_right_grey_24dp"-->
+            <!--android:drawablePadding="8dp"-->
+            <!--android:gravity="right|center_vertical"-->
+            <!--android:clickable="true"-->
+            <!--style="?android:attr/borderlessButtonStyle" />-->
+
+        <TextView
+            android:id="@+id/create_key_import_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/first_time_import_key"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_cancel"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_do_not_save"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_close_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
deleted file mode 100644
index 9b37766e9..000000000
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingTop="16dp">
-
-    <ImageView
-        android:id="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_height" />
-
-    <LinearLayout
-        android:id="@+id/first_time_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/first_time_import_key"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/first_time_import_key"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_folder_grey_24dp"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:clickable="true"
-                android:background="?android:selectableItemBackground" />
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/first_time_create_key"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/first_time_create_key"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:clickable="true"
-                android:background="?android:selectableItemBackground" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/first_time_cancel"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/first_time_skip"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:gravity="center"
-            android:clickable="true"
-            android:background="?android:selectableItemBackground"
-            android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_below="@+id/status_bar"
-        android:layout_above="@+id/first_time_buttons">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/app_name"
-            android:drawableLeft="@drawable/ic_launcher"
-            android:drawablePadding="8dp"
-            android:gravity="center"
-            android:layout_gravity="center_horizontal" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            android:adjustViewBounds="true"
-            android:src="@drawable/first_time_1"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="64dp"
-            android:layout_marginRight="64dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/first_time_text1"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:layout_marginBottom="16dp" />
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 386a9d46e..15e098138 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -16,7 +16,7 @@
 
     <item
         android:id="@+id/menu_key_list_create"
-        android:title="@string/menu_create_key"
+        android:title="@string/menu_manage_keys"
         app:showAsAction="never" />
 
     <item
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 9c16fa413..ab8b00eca 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -71,7 +71,7 @@
   <string name="menu_help">Nápověda</string>
   <string name="menu_export_key">Exportovat do souboru</string>
   <string name="menu_delete_key">Smazat klíč</string>
-  <string name="menu_create_key">Vytvořit moje klíče</string>
+  <string name="menu_manage_keys">Vytvořit moje klíče</string>
   <string name="menu_import_existing_key">Importovat ze souboru</string>
   <string name="menu_search">Hledat</string>
   <string name="menu_beam_preferences">Beam settings</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index fbae159a3..20c8d933d 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -88,7 +88,7 @@
   <string name="menu_help">Hilfe</string>
   <string name="menu_export_key">In Datei exportieren</string>
   <string name="menu_delete_key">Schlüssel löschen</string>
-  <string name="menu_create_key">Erzeuge meinen Schlüssel</string>
+  <string name="menu_manage_keys">Erzeuge meinen Schlüssel</string>
   <string name="menu_import_existing_key">Von Datei importieren</string>
   <string name="menu_search">Suchen</string>
   <string name="menu_nfc_preferences">NFC-Einstellungen</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index d7557074a..6ba096420 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -89,7 +89,7 @@
   <string name="menu_help">Ayuda</string>
   <string name="menu_export_key">Exportar hacia archivo</string>
   <string name="menu_delete_key">Borrar clave</string>
-  <string name="menu_create_key">Crear mi clave</string>
+  <string name="menu_manage_keys">Crear mi clave</string>
   <string name="menu_import_existing_key">Importar desde fichero</string>
   <string name="menu_search">Buscar</string>
   <string name="menu_nfc_preferences">Configuraciones NFC</string>
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
index 32fdfc4cb..73ac12403 100644
--- a/OpenKeychain/src/main/res/values-eu/strings.xml
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -76,7 +76,7 @@
   <string name="menu_help">Laguntza</string>
   <string name="menu_export_key">Esportatu agirira</string>
   <string name="menu_delete_key">Ezabatu giltza</string>
-  <string name="menu_create_key">Sortu nire giltza</string>
+  <string name="menu_manage_keys">Sortu nire giltza</string>
   <string name="menu_import_existing_key">inportatu agiritik</string>
   <string name="menu_search">Bilatu</string>
   <string name="menu_nfc_preferences">NFC ezarpenak</string>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index 4b75d203d..508b17d0a 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -70,7 +70,7 @@
   <string name="menu_help">Apua</string>
   <string name="menu_export_key">Vie tiedostoon</string>
   <string name="menu_delete_key">Poista avain</string>
-  <string name="menu_create_key">Luo minun avaimeni</string>
+  <string name="menu_manage_keys">Luo minun avaimeni</string>
   <string name="menu_import_existing_key">Tuo tiedostosta</string>
   <string name="menu_search">Etsi</string>
   <string name="menu_beam_preferences">Beam asetukset</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index ba6f2e2af..3b3add86a 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -89,7 +89,7 @@
   <string name="menu_help">Aide</string>
   <string name="menu_export_key">Exporter vers un fichier</string>
   <string name="menu_delete_key">Supprimer la clef</string>
-  <string name="menu_create_key">Créer ma clef</string>
+  <string name="menu_manage_keys">Créer ma clef</string>
   <string name="menu_import_existing_key">Importer depuis un fichier</string>
   <string name="menu_search">Rechercher</string>
   <string name="menu_nfc_preferences">Paramètres NFC</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 5de5a1579..4b88aa494 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -69,7 +69,7 @@
   <string name="menu_help">Aiuto</string>
   <string name="menu_export_key">Esporta su un file</string>
   <string name="menu_delete_key">Cancella chiave</string>
-  <string name="menu_create_key">Crea mia chiave</string>
+  <string name="menu_manage_keys">Crea mia chiave</string>
   <string name="menu_import_existing_key">Importa da file</string>
   <string name="menu_search">Cerca</string>
   <string name="menu_beam_preferences">Impostazioni Beam</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 183938811..16b9c3cc4 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -89,7 +89,7 @@
   <string name="menu_help">ヘルプ</string>
   <string name="menu_export_key">ファイルへのエクスポート</string>
   <string name="menu_delete_key">鍵の削除</string>
-  <string name="menu_create_key">自分の鍵の生成</string>
+  <string name="menu_manage_keys">自分の鍵の生成</string>
   <string name="menu_import_existing_key">ファイルからインポート</string>
   <string name="menu_search">検索</string>
   <string name="menu_nfc_preferences">NFC設定</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 0d3cb0094..d77d4e331 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -96,7 +96,7 @@
   <string name="menu_help">Help</string>
   <string name="menu_export_key">Exporteren naar bestand</string>
   <string name="menu_delete_key">Sleutel verwijderen</string>
-  <string name="menu_create_key">Mijn sleutel aanmaken</string>
+  <string name="menu_manage_keys">Mijn sleutel aanmaken</string>
   <string name="menu_import_existing_key">Importeren van bestand</string>
   <string name="menu_search">Zoeken</string>
   <string name="menu_nfc_preferences">NFC-instellingen</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 1ee5a86e7..e4fce6bcc 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -78,7 +78,7 @@
   <string name="menu_help">Pomoc</string>
   <string name="menu_export_key">Eksportuj do pliku</string>
   <string name="menu_delete_key">Usuń klucz</string>
-  <string name="menu_create_key">Utwórz mój klucz</string>
+  <string name="menu_manage_keys">Utwórz mój klucz</string>
   <string name="menu_import_existing_key">Importuj z pliku</string>
   <string name="menu_search">Szukaj</string>
   <string name="menu_beam_preferences">Ustawienia Beam</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 9559ecf51..7cd0cec9b 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -85,7 +85,7 @@
   <string name="menu_help">Помощь</string>
   <string name="menu_export_key">Экспорт в файл</string>
   <string name="menu_delete_key">Удалить ключ</string>
-  <string name="menu_create_key">Создать свой ключ</string>
+  <string name="menu_manage_keys">Создать свой ключ</string>
   <string name="menu_import_existing_key">Импорт из файла</string>
   <string name="menu_search">Поиск</string>
   <string name="menu_nfc_preferences">Настройки NFC</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 3eb8eeba8..3f0def752 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -75,7 +75,7 @@
   <string name="menu_help">Pomoč</string>
   <string name="menu_export_key">Izvozi v datoteko</string>
   <string name="menu_delete_key">Izbriši ključ</string>
-  <string name="menu_create_key">Ustvari zasebni ključ</string>
+  <string name="menu_manage_keys">Ustvari zasebni ključ</string>
   <string name="menu_import_existing_key">Uvozi iz datoteke</string>
   <string name="menu_search">Išči</string>
   <string name="menu_beam_preferences">Nastavitve Beam</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index b5ba0b361..c4c92dce5 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -89,7 +89,7 @@
   <string name="menu_help">Помоћ</string>
   <string name="menu_export_key">Извези у фајл</string>
   <string name="menu_delete_key">Обриши кључ</string>
-  <string name="menu_create_key">Направи ми кључ</string>
+  <string name="menu_manage_keys">Направи ми кључ</string>
   <string name="menu_import_existing_key">Увези из фајла</string>
   <string name="menu_search">Претрага</string>
   <string name="menu_nfc_preferences">НФЦ поставке</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index 93b833590..605e14695 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -78,7 +78,7 @@
   <string name="menu_help">Hjälp</string>
   <string name="menu_export_key">Exportera till fil</string>
   <string name="menu_delete_key">Radera nyckel</string>
-  <string name="menu_create_key">Skapa min nyckel</string>
+  <string name="menu_manage_keys">Skapa min nyckel</string>
   <string name="menu_import_existing_key">Importera från fil</string>
   <string name="menu_search">Sök</string>
   <string name="menu_beam_preferences">Beam-inställningar</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 2b60c9758..b939faf0d 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -69,7 +69,7 @@
   <string name="menu_help">Yardım</string>
   <string name="menu_export_key">Dosyaya ver</string>
   <string name="menu_delete_key">Anahtar sil</string>
-  <string name="menu_create_key">Anahtarımı oluştur</string>
+  <string name="menu_manage_keys">Anahtarımı oluştur</string>
   <string name="menu_import_existing_key">Dosyadan al</string>
   <string name="menu_search">Ara</string>
   <string name="menu_beam_preferences">NFC ayarları</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index b3a161758..f192cb07a 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -69,7 +69,7 @@
   <string name="menu_help">Довідка</string>
   <string name="menu_export_key">Експорт до файлу</string>
   <string name="menu_delete_key">Вилучити ключ</string>
-  <string name="menu_create_key">Створити мій ключ</string>
+  <string name="menu_manage_keys">Створити мій ключ</string>
   <string name="menu_import_existing_key">Імпорт з файлу</string>
   <string name="menu_search">Пошук</string>
   <string name="menu_beam_preferences">Налаштування променя</string>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index 286e98b79..bb8462bf3 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -65,7 +65,7 @@
   <string name="menu_help">說明</string>
   <string name="menu_export_key">匯出到檔案</string>
   <string name="menu_delete_key">刪除金鑰</string>
-  <string name="menu_create_key">建立金鑰</string>
+  <string name="menu_manage_keys">建立金鑰</string>
   <string name="menu_import_existing_key">從檔案匯入</string>
   <string name="menu_search">搜尋</string>
   <string name="menu_beam_preferences">Beam 設定</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index d59b2a2e0..31df7e587 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -57,7 +57,7 @@
   <string name="menu_help">帮助</string>
   <string name="menu_export_key">导出密钥</string>
   <string name="menu_delete_key">删除密钥</string>
-  <string name="menu_create_key">创建密钥</string>
+  <string name="menu_manage_keys">创建密钥</string>
   <string name="menu_search">搜索</string>
   <string name="menu_beam_preferences">参数</string>
   <string name="menu_key_edit_cancel">取消</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f1c14bd32..f22a0c533 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="title_keys">"Keys"</string>
     <string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
     <string name="title_export_log">"Export Log"</string>
+    <string name="title_manage_my_keys">"Manage my keys"</string>
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
@@ -106,7 +107,7 @@
     <string name="menu_help">"Help"</string>
     <string name="menu_export_key">"Export to file"</string>
     <string name="menu_delete_key">"Delete key"</string>
-    <string name="menu_create_key">"Create my key"</string>
+    <string name="menu_manage_keys">"Manage my keys"</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>
@@ -1197,8 +1198,9 @@
 
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
-    <string name="first_time_create_key">"Create my key"</string>
-    <string name="first_time_import_key">"Import from file"</string>
+    <string name="first_time_create_key">"Create my key (recommended)"</string>
+    <string name="first_time_import_key">"Import key from file"</string>
+    <string name="first_time_yubikey">"Use YubiKey NEO"</string>
     <string name="first_time_skip">"Skip Setup"</string>
 
     <!-- unsorted -->
-- 
cgit v1.2.3


From 8d6d4328f23b527be9ea794433b3f160cd58e5a5 Mon Sep 17 00:00:00 2001
From: Kent <itaqmail@gmail.com>
Date: Fri, 20 Mar 2015 06:31:18 +0800
Subject: Implemented #1162: Invoke NFC in Advanced View

 - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
 - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
 - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
 - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
---
 .../main/res/drawable-hdpi/ic_nfc_grey_24dp.png    | Bin 0 -> 1059 bytes
 .../main/res/drawable-mdpi/ic_nfc_grey_24dp.png    | Bin 0 -> 701 bytes
 .../main/res/drawable-xhdpi/ic_nfc_grey_24dp.png   | Bin 0 -> 1359 bytes
 .../main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png  | Bin 0 -> 2040 bytes
 .../main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png | Bin 0 -> 2756 bytes
 .../res/layout/view_key_adv_share_fragment.xml     |  25 +++++++++++++++++----
 6 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png
new file mode 100644
index 000000000..fedf39013
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_grey_24dp.png
new file mode 100644
index 000000000..f8f6c3812
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_grey_24dp.png
new file mode 100644
index 000000000..04e0bf781
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png
new file mode 100644
index 000000000..7e8fa6ba2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png
new file mode 100644
index 000000000..ee00975dc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 6a21e0dc1..c08d66cc1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -99,14 +99,12 @@
             android:layout_weight="1" />
 
         <LinearLayout
-            android:id="@+id/view_key_action_key_share"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
+                android:id="@+id/view_key_action_key_share"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -116,7 +114,25 @@
                 android:layout_weight="1"
                 android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
+                android:gravity="center_vertical"
+                android:background="?android:selectableItemBackground"/>
+
+            <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/view_key_action_key_nfc"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_nfc_grey_24dp"
+                android:layout_gravity="center_vertical"
+                android:background="?android:selectableItemBackground" />
 
             <View
                 android:layout_width="1dip"
@@ -154,6 +170,7 @@
 
         </LinearLayout>
 
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
-- 
cgit v1.2.3


From fa8d5657bec8fc8106635fd7a5d4ad17256fb93b Mon Sep 17 00:00:00 2001
From: Manoj Khanna <manojkhannakm@gmail.com>
Date: Fri, 20 Mar 2015 18:35:20 +0530
Subject: Fixed Snackbar behind keyboard on ImportKeysActivity

---
 .../src/main/res/layout/import_keys_activity.xml     | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 2cba78f37..332b95ce5 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -50,18 +50,19 @@
             android:layout_weight="1"
             android:background="@android:color/white" />
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/import_footer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
             android:background="@android:color/white">
 
             <View
+                android:id="@+id/import_divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dip"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:background="?android:attr/listDivider" />
 
             <TextView
@@ -70,7 +71,10 @@
                 android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_below="@id/import_divider"
                 android:text="@string/import_import"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:drawableRight="@drawable/ic_file_download_grey_24dp"
@@ -79,6 +83,12 @@
                 android:clickable="true"
                 android:background="?android:selectableItemBackground" />
 
-        </LinearLayout>
+            <RelativeLayout
+                android:id="@+id/import_snackbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/import_import" />
+
+        </RelativeLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3