From f44bd236224e782d85c9764a4b655ae922356b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 12 May 2016 14:53:16 +0300
Subject: Revert "Add + button besides TokenAutoComplete, Issue #925"

This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
---
 .../src/main/res/layout/encrypt_asymmetric_fragment.xml        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index f81472cf8..3245fd28b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -39,21 +39,13 @@
 
         <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
             android:id="@+id/recipient_list"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
             android:hint="@string/label_to"
             android:minHeight="56dip"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical" />
-        <ImageView
-            android:id="@+id/add_recipient"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:clickable="true"
-            android:src="@drawable/ic_person_add_grey_24dp"/>
 
     </LinearLayout>
 
-- 
cgit v1.2.3