From dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Mar 2015 02:42:16 +0200
Subject: rewrite EncryptKeyCompletionView with generalized KeyAdapter

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
---
 OpenKeychain/src/main/res/layout/key_list_item.xml |  6 +++--
 .../src/main/res/layout/recipient_box_entry.xml    |  4 +++-
 .../res/layout/recipient_selection_list_entry.xml  | 26 +++++++++++++---------
 3 files changed, 23 insertions(+), 13 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index db0462c6d..fbe5f1326 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -69,7 +70,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout_24dp"
-        android:padding="16dp" />
+        android:padding="16dp"
+        tools:src="@drawable/status_signature_revoked_cutout_24dp"
+        />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
index ab7e5c54f..8857a89af 100644
--- a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
+++ b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
@@ -19,5 +19,7 @@
         android:layout_marginLeft="12dip"
         android:cropToPadding="true"
         android:background="#ccc"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_person_grey_24dp" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
index 57ca9b9d8..a9e86057c 100644
--- a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="48dip"
@@ -21,7 +22,8 @@
             android:layout_height="wrap_content"
             android:paddingLeft="8dip"
             android:singleLine="true"
-            android:ellipsize="end" />
+            android:ellipsize="end"
+            tools:text="Alice" />
 
         <TextView
             android:id="@android:id/text1"
@@ -32,7 +34,8 @@
             android:paddingLeft="16dip"
             android:singleLine="true"
             android:ellipsize="end"
-            android:layout_marginTop="-4dip" />
+            android:layout_marginTop="-4dip"
+            tools:text="alice@example.com" />
 
         <TextView
             android:id="@android:id/text2"
@@ -43,15 +46,18 @@
             android:paddingLeft="16dip"
             android:singleLine="true"
             android:ellipsize="end"
-            android:layout_marginTop="-4dip" />
+            android:layout_marginTop="-4dip"
+            tools:text="Creation 12.03.2015" />
+
     </LinearLayout>
 
     <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="56dip"
-        android:layout_height="56dip"
-        android:layout_marginLeft="12dip"
-        android:cropToPadding="true"
-        android:background="#ccc"
-        android:scaleType="centerCrop" />
+        android:id="@+id/status_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="16dp"
+        tools:src="@drawable/status_signature_revoked_cutout_24dp"
+        />
+
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3