From 1b0666e9de5caea14997a3e638a6209b45c97d60 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Sun, 6 Jul 2014 02:10:35 +0200
Subject: Many changes to file ... and still incomplete

- Multi file
- Reworked UI
---
 .../res/layout/encrypt_asymmetric_fragment.xml     | 64 ++--------------------
 1 file changed, 5 insertions(+), 59 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index cde92b477..284fdd9ce 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -9,69 +9,15 @@
     android:paddingRight="16dp"
     android:paddingLeft="16dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <CheckBox
+    <CheckBox
             android:id="@+id/sign"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/label_sign" />
+            android:text="@string/label_sign"/>
 
-        <LinearLayout
+    <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
+            android:id="@+id/recipient_list"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingRight="4dip">
-
-            <TextView
-                android:id="@+id/mainUserId"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <TextView
-                android:id="@+id/mainUserIdRest"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/label_selectPublicKeys"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:text="@string/label_select_public_keys"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Button
-            android:id="@+id/btn_selectEncryptKeys"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="4dp"
-            android:text="@string/select_keys_button_default"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_person" />
-    </LinearLayout>
+            android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3