From bc43797c32542aa48a34f44d486645d24fca06ba Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 9 Mar 2015 00:37:14 +0530
Subject: added card

---
 .../src/main/res/layout/view_key_fragment.xml      | 38 +++++++++++++++++++---
 OpenKeychain/src/main/res/values/strings.xml       |  1 +
 2 files changed, 34 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index bba412f99..7f3ef0f1e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+            xmlns:card_view="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,16 +31,44 @@
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/section_user_ids" />
+                    android:text="@string/section_user_ids"/>
 
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
                     android:id="@+id/view_key_user_ids"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp" />
+                    android:layout_marginBottom="4dp"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
+        <android.support.v7.widget.CardView
+            android:id="@+id/linked_system_contact_card"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2dp"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/CardViewHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/section_linked_system_contact"/>
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/view_key_linked_system_contact"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2c83ac070..61c406d48 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
+    <string name="section_linked_system_contact">"Linked System Contact"</string>
     <string name="section_should_you_trust">"Should you trust this key?"</string>
     <string name="section_proof_details">Proof verification</string>
     <string name="section_cloud_evidence">"Proofs from the cloud"</string>
-- 
cgit v1.2.3


From f8a6f814dd4f4e015707085c297b91abf237ed14 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Tue, 10 Mar 2015 01:05:40 +0530
Subject: added contact linking

---
 .../src/main/res/layout/view_key_fragment.xml      | 23 +++++++++++++++++++---
 OpenKeychain/src/main/res/values/strings.xml       |  2 ++
 2 files changed, 22 insertions(+), 3 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 7f3ef0f1e..d8584bca6 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -62,11 +62,28 @@
                     android:layout_height="wrap_content"
                     android:text="@string/section_linked_system_contact"/>
 
-                <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                    android:id="@+id/view_key_linked_system_contact"
+                <LinearLayout
+                    android:id='@+id/system_contact_layout'
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"/>
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/system_contact_picture"
+                        android:layout_margin="6dp"
+                        android:layout_width="60dp"
+                        android:layout_height="60dp"
+                        android:scaleType="centerCrop"
+                        android:src="@color/bg_gray"/>
+
+                    <TextView
+                        android:id="@+id/system_contact_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/view_key_fragment_no_system_contact"/>
+                </LinearLayout>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 61c406d48..784f2825c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -639,6 +639,8 @@
     <string name="view_key_verified">"Confirmed Key"</string>
     <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string>
 
+    <string name="view_key_fragment_no_system_contact">"&lt;none&gt;"</string>
+
     <!-- Navigation Drawer -->
     <string name="nav_keys">"Keys"</string>
     <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string>
-- 
cgit v1.2.3


From 7d2e2e3eec85193f41554605483506b1233e7f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 9 Mar 2015 22:00:44 +0100
Subject: Make create key wizard step-by-step

---
 .../drawable-hdpi/ic_chevron_left_grey_24dp.png    | Bin 0 -> 276 bytes
 .../drawable-hdpi/ic_chevron_right_grey_24dp.png   | Bin 0 -> 271 bytes
 .../main/res/drawable-hdpi/ic_person_grey_48dp.png | Bin 0 -> 576 bytes
 .../drawable-mdpi/ic_chevron_left_grey_24dp.png    | Bin 0 -> 240 bytes
 .../drawable-mdpi/ic_chevron_right_grey_24dp.png   | Bin 0 -> 225 bytes
 .../main/res/drawable-mdpi/ic_person_grey_48dp.png | Bin 0 -> 431 bytes
 .../drawable-xhdpi/ic_chevron_left_grey_24dp.png   | Bin 0 -> 314 bytes
 .../drawable-xhdpi/ic_chevron_right_grey_24dp.png  | Bin 0 -> 305 bytes
 .../res/drawable-xhdpi/ic_person_grey_48dp.png     | Bin 0 -> 751 bytes
 .../drawable-xxhdpi/ic_chevron_left_grey_24dp.png  | Bin 0 -> 382 bytes
 .../drawable-xxhdpi/ic_chevron_right_grey_24dp.png | Bin 0 -> 388 bytes
 .../res/drawable-xxhdpi/ic_person_grey_48dp.png    | Bin 0 -> 1121 bytes
 .../drawable-xxxhdpi/ic_chevron_left_grey_24dp.png | Bin 0 -> 481 bytes
 .../ic_chevron_right_grey_24dp.png                 | Bin 0 -> 472 bytes
 .../res/drawable-xxxhdpi/ic_person_grey_48dp.png   | Bin 0 -> 1488 bytes
 .../main/res/layout/create_key_email_fragment.xml  |  84 ++++++++++++
 .../main/res/layout/create_key_final_fragment.xml  |  46 +++----
 .../main/res/layout/create_key_input_fragment.xml  | 145 ---------------------
 .../main/res/layout/create_key_name_fragment.xml   |  83 ++++++++++++
 .../res/layout/create_key_passphrase_fragment.xml  |  96 ++++++++++++++
 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-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-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/strings.xml       |   6 +-
 35 files changed, 296 insertions(+), 192 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png
new file mode 100644
index 000000000..12e39d39d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_left_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png
new file mode 100644
index 000000000..7eef500d4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_chevron_right_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png
new file mode 100644
index 000000000..de2a86e89
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png
new file mode 100644
index 000000000..56ab24da9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_left_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png
new file mode 100644
index 000000000..d6581fe23
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_chevron_right_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png
new file mode 100644
index 000000000..738e3490d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png
new file mode 100644
index 000000000..df0518a68
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_left_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png
new file mode 100644
index 000000000..7b82b8a57
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chevron_right_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png
new file mode 100644
index 000000000..e664e94ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_person_grey_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png
new file mode 100644
index 000000000..10643ae3f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_left_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png
new file mode 100644
index 000000000..360d3c5ec
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chevron_right_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png
new file mode 100644
index 000000000..5f00cf8a2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_person_grey_48dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png
new file mode 100644
index 000000000..a5fb05c28
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_left_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png
new file mode 100644
index 000000000..a71c5b3fc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chevron_right_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png
new file mode 100644
index 000000000..001fe6607
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_person_grey_48dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
new file mode 100644
index 000000000..a24d1a2ee
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -0,0 +1,84 @@
+<?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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/create_key_buttons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/create_key_email_text" />
+
+            <org.sufficientlysecure.keychain.ui.widget.EmailEditText
+                android:id="@+id/create_key_email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
+                android:hint="@string/label_email"
+                android:ems="10" />
+
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        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_back_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/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="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_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/btn_next"
+            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" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 84625d1fd..830f039f7 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -6,7 +6,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/create_key_buttons_divider">
+        android:layout_above="@+id/create_key_buttons">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -144,58 +144,42 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:background="@color/holo_gray_bright"
         android:id="@+id/create_key_buttons">
 
         <TextView
             android:id="@+id/create_key_back_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            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_back"
+            android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:gravity="center_vertical"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="left|center_vertical"
             android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/listDivider" />
+            style="?android:attr/borderlessButtonStyle" />
 
         <TextView
-            android:id="@+id/create_key_create_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            android:id="@+id/create_key_next_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/btn_create_key"
+            android:textAllCaps="true"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
             android:drawablePadding="8dp"
-            android:gravity="center_vertical"
+            android:gravity="right|center_vertical"
             android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical" />
+            style="?android:attr/borderlessButtonStyle" />
     </LinearLayout>
 
-    <View
-        android:id="@+id/create_key_buttons_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/create_key_buttons"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
deleted file mode 100644
index 2178fcb1f..000000000
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:layout_above="@+id/create_key_button_divider">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/create_key_text" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/label_user_id" />
-
-            <org.sufficientlysecure.keychain.ui.widget.NameEditText
-                android:id="@+id/create_key_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:imeOptions="actionNext"
-                android:inputType="textAutoCorrect|textPersonName|textCapWords"
-                android:hint="@string/create_key_hint_full_name"
-                android:ems="10" />
-
-            <org.sufficientlysecure.keychain.ui.widget.EmailEditText
-                android:id="@+id/create_key_email"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:imeOptions="actionNext"
-                android:hint="@string/label_email"
-                android:ems="10" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/label_passphrase" />
-
-            <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText
-                android:id="@+id/create_key_passphrase"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:imeOptions="actionNext"
-                android:inputType="textPassword"
-                android:hint="@string/label_passphrase"
-                android:ems="10"
-                android:layout_gravity="center_horizontal" />
-
-            <EditText
-                android:id="@+id/create_key_passphrase_again"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:inputType="textPassword"
-                android:hint="@string/label_passphrase_again"
-                android:ems="10"
-                android:layout_gravity="center_horizontal" />
-
-        </LinearLayout>
-    </ScrollView>
-
-    <View
-        android:id="@+id/create_key_button_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/create_key_buttons"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:id="@+id/create_key_buttons">
-
-        <TextView
-            android:id="@+id/create_key_back_button"
-            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=""
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:gravity="center_vertical"
-            android:layout_gravity="center_vertical" />
-
-        <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/create_key_button"
-            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/btn_next"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
new file mode 100644
index 000000000..ea064b00c
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
@@ -0,0 +1,83 @@
+<?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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/create_key_buttons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/create_key_name_text" />
+
+            <org.sufficientlysecure.keychain.ui.widget.NameEditText
+                android:id="@+id/create_key_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
+                android:inputType="textAutoCorrect|textPersonName|textCapWords"
+                android:hint="@string/create_key_hint_full_name"
+                android:ems="10" />
+
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        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_back_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:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawablePadding="8dp"
+            android:gravity="left|center_vertical"
+            android:clickable="false"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_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/btn_next"
+            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" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
new file mode 100644
index 000000000..4b09c6cac
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
@@ -0,0 +1,96 @@
+<?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">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/create_key_buttons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/create_key_passphrase_text" />
+
+            <org.sufficientlysecure.keychain.ui.widget.PassphraseEditText
+                android:id="@+id/create_key_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
+                android:inputType="textPassword"
+                android:hint="@string/label_passphrase"
+                android:ems="10"
+                android:layout_gravity="center_horizontal" />
+
+            <EditText
+                android:id="@+id/create_key_passphrase_again"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:inputType="textPassword"
+                android:hint="@string/label_passphrase_again"
+                android:ems="10"
+                android:layout_gravity="center_horizontal" />
+
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        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_back_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/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="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_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/btn_next"
+            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" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 903cc50f3..ce4f1cdcf 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -464,7 +464,7 @@
   <string name="create_key_final_robot_text">Vytvoření klíče může chvíli trvat, mezitím si dejte třeba šálek dobré kávy...</string>
   <string name="create_key_rsa">(3 podklíče, RSA, 4096 bit)</string>
   <string name="create_key_custom">(uživatelská konfigurace klíče)</string>
-  <string name="create_key_text">Zadejte své celé jméno, emailovou adresu a zvolte heslo.</string>
+  <string name="create_key_identity_text">Zadejte své celé jméno, emailovou adresu a zvolte heslo.</string>
   <string name="create_key_hint_full_name">Celé jméno, např. Jan Novák</string>
   <string name="create_key_edit">Změnit konfiguraci klíče</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 63b0c4c09..245de82ec 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -528,7 +528,7 @@
   <string name="create_key_final_robot_text">Einen Schlüssel zu erzeugen braucht eine Weile, trink in der Zeit einen Kaffee...</string>
   <string name="create_key_rsa">(3 Unterschlüssel, RSA, 4096 Bit)</string>
   <string name="create_key_custom">(Benutzerdefinierte Schlüsseleinstellung)</string>
-  <string name="create_key_text">Vollen Namen und Emailadresse angeben und Passwort wählen.</string>
+  <string name="create_key_identity_text">Vollen Namen und Emailadresse angeben und Passwort wählen.</string>
   <string name="create_key_hint_full_name">Vollständiger Name, z.B. Max Mustermann</string>
   <string name="create_key_edit">Schlüsselkonfiguration ändern</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 0d7444c47..d5d8440af 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -575,7 +575,7 @@
   <string name="create_key_final_robot_text">Crear una clave puede llevar un tiempo, tómese una taza de café entre tanto...</string>
   <string name="create_key_rsa">(3 subclaves, RSA, 4096 bits)</string>
   <string name="create_key_custom">(configuración de clave personalizada)</string>
-  <string name="create_key_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string>
+  <string name="create_key_identity_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string>
   <string name="create_key_hint_full_name">Nombre completo, ej. Max Mustermann</string>
   <string name="create_key_edit">Cambiar configuración de clave</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 50bd53921..8cc1cc735 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -573,7 +573,7 @@
   <string name="create_key_final_robot_text">Créer une clef peut prendre du temps, prenez donc un café en attendant...</string>
   <string name="create_key_rsa">(3 sous-clefs, RSA, 4096 bits)</string>
   <string name="create_key_custom">(configuration personnalisée de la clef)</string>
-  <string name="create_key_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string>
+  <string name="create_key_identity_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string>
   <string name="create_key_hint_full_name">Nom complet, p. ex. Marc-Olivier Lagacé</string>
   <string name="create_key_edit">Changer la configuration de la clef</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index d741f7111..f55d16dfc 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -482,7 +482,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="create_key_final_robot_text">La creazione di una chiave richiede un po\' di tempo, prendi un caffè nel frattempo...</string>
   <string name="create_key_rsa">(3 sottochiavi, RSA, 4096 bit)</string>
   <string name="create_key_custom">(personalizza la configurazione della chiave)</string>
-  <string name="create_key_text">Inserisci Nome Completo, Email e scegli una Frase di Accesso.</string>
+  <string name="create_key_identity_text">Inserisci Nome Completo, Email e scegli una Frase di Accesso.</string>
   <string name="create_key_hint_full_name">Nome completo, es: Mario Rossi</string>
   <string name="create_key_edit">Cambia configurazione della chiave</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index c5318db36..ef817f398 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -532,7 +532,7 @@
   <string name="create_key_final_robot_text">しばらくの間鍵を生成しています、その間はコーヒーでもどうぞ....</string>
   <string name="create_key_rsa">(3副鍵、RSA, 4096 bit)</string>
   <string name="create_key_custom">(個別の鍵設定)</string>
-  <string name="create_key_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string>
+  <string name="create_key_identity_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string>
   <string name="create_key_hint_full_name">フルネーム、例えば Max Mustermann</string>
   <string name="create_key_edit">鍵の設定変更</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 34b8f1627..f8ee75750 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -575,7 +575,7 @@
   <string name="create_key_final_robot_text">Een sleutel aanmaken kan even duren, maak intussen een tasje thee klaar…</string>
   <string name="create_key_rsa">(3 subsleutels, RSA, 4096 bit)</string>
   <string name="create_key_custom">(aangepaste sleutelconfiguratie)</string>
-  <string name="create_key_text">Voer je volledige naam en e-mailadres in, en kies een wachtwoord.</string>
+  <string name="create_key_identity_text">Voer je volledige naam en e-mailadres in, en kies een wachtwoord.</string>
   <string name="create_key_hint_full_name">Volledige naam, bv. Max Mustermann</string>
   <string name="create_key_edit">Sleutelconfiguratie wijzigen</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 3dc6a2a35..46dd8c313 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -540,7 +540,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="create_key_final_robot_text">Tworzenie klucza może zająć trochę czasu... w międzyczasie idź się napij kawy.</string>
   <string name="create_key_rsa">(3 pod-klucze, RSA, 4096 bit)</string>
   <string name="create_key_custom">(niestandardowa konfiguracja kluczy)</string>
-  <string name="create_key_text">Wpisz swoje imię, adres email oraz wybierz hasło.</string>
+  <string name="create_key_identity_text">Wpisz swoje imię, adres email oraz wybierz hasło.</string>
   <string name="create_key_hint_full_name">Imię i nazwisko, na przykład, Jan Kowalski</string>
   <string name="create_key_edit">Zmień klucz konfiguracji</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index dc1c81bb4..211433d26 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -490,7 +490,7 @@
   <string name="create_key_final_robot_text">Создание ключа займет некоторое время, можете пока выпить чашечку кофе...</string>
   <string name="create_key_rsa">(3 доп. ключа, RSA, 4096 bit)</string>
   <string name="create_key_custom">(произвольная конфигурация ключа)</string>
-  <string name="create_key_text">Укажите полное имя, адрес почты и придумайте надежный пароль.</string>
+  <string name="create_key_identity_text">Укажите полное имя, адрес почты и придумайте надежный пароль.</string>
   <string name="create_key_hint_full_name">Полное имя, напр. Иван Хлестаков</string>
   <string name="create_key_edit">Изменить конфигурацию ключа</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index 11639e2eb..73094c5a4 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -558,7 +558,7 @@
   <string name="create_key_final_robot_text">Прављење кључа може да потраје, попијте кафу у међувремену…</string>
   <string name="create_key_rsa">(3 поткључа, РСА, 4096 бита)</string>
   <string name="create_key_custom">(прилагођена конфигурација кључа)</string>
-  <string name="create_key_text">Унесите пуно име, адресу е-поште и укуцајте лозинку.</string>
+  <string name="create_key_identity_text">Унесите пуно име, адресу е-поште и укуцајте лозинку.</string>
   <string name="create_key_hint_full_name">Пуно име, нпр. Петар Петровић</string>
   <string name="create_key_edit">Промени конфигурацију кључа</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index a24fe7ee7..d22eea22a 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -521,7 +521,7 @@
   <string name="create_key_final_robot_text">Att skapa en nyckel kan ta ett tag, drick en kopp kaffe under tiden…</string>
   <string name="create_key_rsa">(3 undernycklar, RSA, 4096 bit)</string>
   <string name="create_key_custom">(anpassad nyckelkonfiguration)</string>
-  <string name="create_key_text">Ange ditt fullständiga namn, e-postadress och välj en lösenordsfras.</string>
+  <string name="create_key_identity_text">Ange ditt fullständiga namn, e-postadress och välj en lösenordsfras.</string>
   <string name="create_key_hint_full_name">Fullständigt namn, t.ex. Kalle Svensson</string>
   <string name="create_key_edit">Ändra nyckelkonfiguration</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 7b6a976f5..ee5306cc7 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -449,7 +449,7 @@
   <string name="create_key_final_robot_text">Anahtar oluşturma biraz zaman alabilir, bu sırada bir çay için...</string>
   <string name="create_key_rsa">(3 alt anahtar, RSA, 4096 bit)</string>
   <string name="create_key_custom">(özel anahtar yapılandırması)</string>
-  <string name="create_key_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string>
+  <string name="create_key_identity_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string>
   <string name="create_key_hint_full_name">Tam Ad, örneğin: Max Mustermann</string>
   <string name="create_key_edit">Anahtar yapılandırmasını değiştir.</string>
   <!--View key-->
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index cf586b2d5..365821f4a 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -449,7 +449,7 @@
   <string name="create_key_empty">Це поле - обов\'язкове</string>
   <string name="create_key_passphrases_not_equal">Паролі фрази не збігаються</string>
   <string name="create_key_final_text">Ви ввели наступну сутність:</string>
-  <string name="create_key_text">Введіть ваше повне ім\'я, електронну адреса та оберіть парольну фразу.</string>
+  <string name="create_key_identity_text">Введіть ваше повне ім\'я, електронну адреса та оберіть парольну фразу.</string>
   <string name="create_key_hint_full_name">Повне ім\'я, наприклад Степан Бандера</string>
   <!--View key-->
   <!--Navigation Drawer-->
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index b6ab2c8a4..b5b57d91f 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -377,7 +377,7 @@
   <string name="create_key_empty">必填欄位</string>
   <string name="create_key_passphrases_not_equal">口令不相符</string>
   <string name="create_key_final_robot_text">建立金鑰可能需要一點時間，來杯咖啡吧…</string>
-  <string name="create_key_text">輸入你的全名、電子郵件，並選擇一組口令。</string>
+  <string name="create_key_identity_text">輸入你的全名、電子郵件，並選擇一組口令。</string>
   <!--View key-->
   <!--Navigation Drawer-->
   <string name="nav_keys">金鑰</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 784f2825c..8c4db3bac 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -627,8 +627,10 @@
     <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string>
     <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string>
     <string name="create_key_custom">"(custom key configuration)"</string>
-    <string name="create_key_text">"Enter your full name, email address, and choose a passhrase."</string>
-    <string name="create_key_hint_full_name">"Full Name, e.g. Max Mustermann"</string>
+    <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string>
+    <string name="create_key_email_text">"Choose the email address used for encrypted communication."</string>
+    <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string>
+    <string name="create_key_hint_full_name">"Full Name or Nickname"</string>
     <string name="create_key_edit">"Change key configuration"</string>
 
     <!-- View key -->
-- 
cgit v1.2.3


From 5f0a468d9a3645c8c209d00d74b13709de154f5b Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Tue, 10 Mar 2015 02:48:04 +0530
Subject: changed default drawable for linked system contact

---
 OpenKeychain/src/main/res/layout/view_key_fragment.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index d8584bca6..59939d8fa 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -71,10 +71,10 @@
                     <ImageView
                         android:id="@+id/system_contact_picture"
                         android:layout_margin="6dp"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
                         android:scaleType="centerCrop"
-                        android:src="@color/bg_gray"/>
+                        android:src="@drawable/ic_person_grey_48dp"/>
 
                     <TextView
                         android:id="@+id/system_contact_name"
-- 
cgit v1.2.3


From 301200197926cc4b951b08aec79f632774d764ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 9 Mar 2015 22:09:48 +0100
Subject: Show passphrase checkbox in create key

---
 .../src/main/res/layout/create_key_passphrase_fragment.xml         | 7 +++++++
 OpenKeychain/src/main/res/values/strings.xml                       | 1 +
 2 files changed, 8 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
index 4b09c6cac..48b86765a 100644
--- a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
@@ -46,6 +46,13 @@
                 android:ems="10"
                 android:layout_gravity="center_horizontal" />
 
+            <CheckBox
+                android:id="@+id/create_key_show_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:text="@string/label_show_passphrase" />
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8c4db3bac..e9869b0de 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -129,6 +129,7 @@
     <string name="label_passphrase">"Passphrase"</string>
     <string name="label_unlock">"Unlocking…"</string>
     <string name="label_passphrase_again">"Repeat Passphrase"</string>
+    <string name="label_show_passphrase">"Show Passphrase"</string>
     <string name="label_algorithm">"Algorithm"</string>
     <string name="label_ascii_armor">"File ASCII Armor"</string>
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
-- 
cgit v1.2.3


From bce0fe62217e1f174559354b1a0dc06fd9663385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 10 Mar 2015 01:44:07 +0100
Subject: Add additional email addresses in create key

---
 .../main/res/drawable-hdpi/ic_email_grey_24dp.png  | Bin 0 -> 372 bytes
 .../main/res/drawable-mdpi/ic_email_grey_24dp.png  | Bin 0 -> 307 bytes
 .../main/res/drawable-xhdpi/ic_email_grey_24dp.png | Bin 0 -> 439 bytes
 .../res/drawable-xxhdpi/ic_email_grey_24dp.png     | Bin 0 -> 563 bytes
 .../res/drawable-xxxhdpi/ic_email_grey_24dp.png    | Bin 0 -> 805 bytes
 .../src/main/res/layout/add_email_dialog.xml       |  26 +++++++++++++++++++
 .../main/res/layout/create_key_email_fragment.xml  |   7 ++++++
 .../res/layout/create_key_email_list_footer.xml    |  23 +++++++++++++++++
 .../main/res/layout/create_key_email_list_item.xml |  28 +++++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |   5 +++-
 10 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/add_email_dialog.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_email_list_item.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..56c0a8c94
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..b971cd9fd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..6d7dd4fc9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..c50ea840a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png
new file mode 100644
index 000000000..9420d8205
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
new file mode 100644
index 000000000..68d895145
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/create_key_add_email_text"
+        android:textAppearance="?android:textAppearanceMedium" />
+
+    <org.sufficientlysecure.keychain.ui.widget.EmailEditText
+        android:id="@+id/add_email_address"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="@string/label_email"
+        android:imeOptions="actionNext"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
index a24d1a2ee..17cfe54ac 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
@@ -4,6 +4,7 @@
     android:layout_height="match_parent">
 
     <ScrollView
+        android:layout_alignParentTop="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
@@ -34,6 +35,12 @@
                 android:hint="@string/label_email"
                 android:ems="10" />
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/create_key_emails"
+                android:scrollbars="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml
new file mode 100644
index 000000000..3e58d40e5
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="16dp"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <Button
+        android:id="@+id/create_key_add_email"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/btn_add_email"
+        style="?android:attr/borderlessButtonStyle"
+        android:drawableLeft="@drawable/ic_email_grey_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="left|center_vertical" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
new file mode 100644
index 000000000..91ba72884
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="16dp"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <TextView
+        android:id="@+id/create_key_email_item_email"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:layout_weight="1"
+        android:text="alice@example.com"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingLeft="8dp" />
+
+    <ImageButton
+        android:id="@+id/create_key_email_item_delete_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        android:src="@drawable/ic_close_grey_24dp"
+        android:layout_gravity="center_vertical"
+        style="@style/SelectableItem" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a9d7e10c7..05daf8951 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="btn_decrypt_files">"Decrypt files"</string>
     <string name="btn_encrypt_files">"Encrypt files"</string>
     <string name="btn_encrypt_text">"Encrypt text"</string>
+    <string name="btn_add_email">"Add additional email address"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
@@ -628,10 +629,12 @@
     <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string>
     <string name="create_key_custom">"(custom key configuration)"</string>
     <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string>
-    <string name="create_key_email_text">"Choose the email address used for encrypted communication."</string>
+    <string name="create_key_email_text">"Enter your main email address used for secure communication."</string>
     <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string>
     <string name="create_key_hint_full_name">"Full Name or Nickname"</string>
     <string name="create_key_edit">"Change key configuration"</string>
+    <string name="create_key_add_email">"Add email address"</string>
+    <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-- 
cgit v1.2.3


From b3257e0ffa53f93d550d71c1a5ffcecb4f4df0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 10 Mar 2015 02:13:36 +0100
Subject: Ripple

---
 .../src/main/res/layout/api_account_settings_fragment.xml    |  2 +-
 OpenKeychain/src/main/res/layout/certify_key_fragment.xml    |  2 +-
 .../src/main/res/layout/create_key_email_list_item.xml       |  2 +-
 .../src/main/res/layout/create_key_final_fragment.xml        |  2 +-
 OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml   |  4 ++--
 OpenKeychain/src/main/res/layout/decrypt_result_include.xml  |  4 ++--
 OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml   |  4 ++--
 OpenKeychain/src/main/res/layout/file_list_entry.xml         |  2 +-
 OpenKeychain/src/main/res/layout/first_time_activity.xml     |  6 +++---
 OpenKeychain/src/main/res/layout/import_keys_activity.xml    |  2 +-
 .../src/main/res/layout/import_keys_cloud_fragment.xml       |  4 ++--
 .../src/main/res/layout/import_keys_file_fragment.xml        |  4 ++--
 .../src/main/res/layout/import_keys_qr_code_fragment.xml     |  4 ++--
 OpenKeychain/src/main/res/layout/key_list_item.xml           |  2 +-
 .../res/layout/passphrase_wizard_fragment_select_methods.xml |  8 ++++----
 OpenKeychain/src/main/res/layout/safe_slinger_activity.xml   |  2 +-
 OpenKeychain/src/main/res/layout/upload_key_activity.xml     |  2 +-
 OpenKeychain/src/main/res/layout/view_cert_activity.xml      |  2 +-
 .../src/main/res/layout/view_key_adv_share_fragment.xml      | 12 ++++++------
 .../src/main/res/layout/view_key_adv_subkey_item.xml         |  2 +-
 .../src/main/res/layout/view_key_adv_user_id_item.xml        |  2 +-
 OpenKeychain/src/main/res/layout/view_key_fragment.xml       |  2 ++
 OpenKeychain/src/main/res/values/styles.xml                  |  4 ----
 23 files changed, 39 insertions(+), 41 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index f9a8e9933..88b96284f 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -72,7 +72,7 @@
 
     <TextView
         android:id="@+id/api_account_settings_create_key"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index c1227f906..23685ce15 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -77,7 +77,7 @@
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             android:paddingRight="4dp"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
index 91ba72884..0968f3a63 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
@@ -23,6 +23,6 @@
         android:padding="8dp"
         android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
+        android:background="?android:selectableItemBackground" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 830f039f7..e085fcb09 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -113,7 +113,7 @@
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:gravity="center_vertical"
                     android:clickable="true"
-                    style="@style/SelectableItem"
+                    android:background="?android:selectableItemBackground"
                     android:layout_gravity="center_vertical" />
             </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index a5646dc26..2ef411eaf 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -32,7 +32,7 @@
 
                 android:id="@+id/decrypt_file_browse"
                 android:clickable="true"
-                style="@style/SelectableItem">
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -81,7 +81,7 @@
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
-                    style="@style/SelectableItem"
+                    android:background="?android:selectableItemBackground"
                     android:drawableRight="@drawable/ic_save_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 9d47009b9..debc1106f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -75,7 +75,7 @@
             android:clickable="true"
             android:layout_marginLeft="32dp"
             android:paddingRight="4dp"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <LinearLayout
@@ -121,7 +121,7 @@
                 android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index 0f341b2d6..fb01a5ef0 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -48,7 +48,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -79,7 +79,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index fafdd1713..ca78ad161 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -56,5 +56,5 @@
             android:src="@drawable/ic_close_grey_24dp"
             android:clickable="true"
             android:layout_centerVertical="true"
-            style="@style/SelectableItem"/>
+        android:background="?android:selectableItemBackground"/>
 </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
index bab9e2e27..9b37766e9 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -43,7 +43,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
             <View
                 android:layout_width="1dp"
@@ -67,7 +67,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -87,7 +87,7 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:gravity="center"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 6ac0b468c..2cba78f37 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -77,7 +77,7 @@
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index a7234d848..1fc8cfdcb 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -31,7 +31,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_search_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
         <View
             android:layout_width="1dip"
@@ -48,7 +48,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_settings_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index bde4dafc0..c1b9eb276 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:orientation="horizontal">
 
         <TextView
@@ -40,7 +40,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
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 9007d2149..80e59ad18 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
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:orientation="horizontal">
 
         <TextView
@@ -40,7 +40,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_nfc_white_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 595dcd77b..db0462c6d 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -60,7 +60,7 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_repeat_grey_24dp"
             android:padding="12dp"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
index 42baa6a0d..d509fbeec 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
@@ -33,7 +33,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="noPassphrase"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
 
         <View
             android:layout_width="match_parent"
@@ -51,7 +51,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="passphrase"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -67,7 +67,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="startLockpattern"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -83,7 +83,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="NFC"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
 
     </LinearLayout>
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index bafad173b..eb8547ade 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -51,7 +51,7 @@
                 android:layout_height="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
                 android:paddingRight="4dp"
-                style="@style/SelectableItem"
+                android:background="?android:selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 6b7390b27..6a0be9ce5 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -63,7 +63,7 @@
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:clickable="true"
-                    style="@style/SelectableItem" />
+                    android:background="?android:selectableItemBackground" />
 
             </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 08be4ab05..789c7c774 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -211,7 +211,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
-                style="@style/SelectableItem"
+                android:background="?android:selectableItemBackground"
                 android:text="@string/btn_view_cert_key"
                 android:layout_weight="1"
                 android:drawableRight="@drawable/ic_person_grey_24dp"
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 ec26b4a76..6a21e0dc1 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
@@ -27,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -59,7 +59,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -103,7 +103,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -133,7 +133,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
             <View
                 android:layout_width="1dip"
@@ -150,7 +150,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_repeat_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -168,7 +168,7 @@
             android:layout_height="wrap_content"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:text="@string/key_view_action_upload"
             android:layout_weight="1"
             android:drawableRight="@drawable/ic_file_upload_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index 28eef58a4..c9eb37f5e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:src="@drawable/ic_close_grey_24dp"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </FrameLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index cd7a79663..1c55a1446 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -75,6 +75,6 @@
         android:padding="8dp"
         android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
+        android:background="?android:selectableItemBackground" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 59939d8fa..454d5f9c7 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -64,6 +64,8 @@
 
                 <LinearLayout
                     android:id='@+id/system_contact_layout'
+                    android:clickable="true"
+                    android:background="?android:selectableItemBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 8d8797bf0..9ac60c397 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -21,10 +21,6 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="SelectableItem">
-        <item name="android:background">@drawable/selector_transparent_button</item>
-    </style>
-
     <style name="FabMenuStyle">
         <item name="android:background">@drawable/fab_label_background</item>
         <item name="android:textColor">@color/white</item>
-- 
cgit v1.2.3