Merge branch 'master' into ditch-appmsg

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

1 files changed, 117 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
new file mode 100644
index 000000000..0c0a5d7e6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
@@ -0,0 +1,117 @@
+<?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="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <ImageView
+        android:id="@+id/ic_masterKey"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/key_small"
+        android:padding="8dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/edit_image"
+        android:src="@drawable/ic_action_edit"
+        android:padding="8dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_toRightOf="@id/ic_masterKey"
+        android:layout_toLeftOf="@id/edit_image"
+        android:layout_centerVertical="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dp"
+        android:id="@+id/linearLayout">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="2dip"
+            android:paddingTop="2dip">
+
+            <TextView
+                android:id="@+id/keyId"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="0x00000000"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:typeface="monospace"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/ic_certifyKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/certify_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/ic_encryptKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/encrypted_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/ic_signKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/ic_revokedKey"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/revoked_key_small"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/keyDetails"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:paddingRight="5dip"
+                android:text="RSA, 1024bit"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/keyExpiry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Expiry: 4/7/2016"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_gravity="right" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>