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
---
 .../keychain/ui/EncryptModeAsymmetricFragment.java     |  9 ---------
 .../keychain/ui/widget/EncryptKeyCompletionView.java   | 18 ------------------
 .../main/res/layout/encrypt_asymmetric_fragment.xml    | 10 +---------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
index 51022094b..b2b85ec14 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
@@ -21,7 +21,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.ViewAnimator;
 
 import com.tokenautocomplete.TokenCompleteTextView;
@@ -110,14 +109,6 @@ public class EncryptModeAsymmetricFragment extends EncryptModeFragment {
             }
         });
 
-        ImageView addRecipientImgView = (ImageView) view.findViewById(R.id.add_recipient);
-        addRecipientImgView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mEncryptKeyView.showAllKeys();
-            }
-        });
-
         return view;
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index 4074d391b..78f9f431b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -177,22 +177,4 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
         mLoaderManager.restartLoader(0, args, this);
     }
 
-    @Override
-    public boolean enoughToFilter() {
-        return true;
-    }
-
-    public void showAllKeys(){
-        Bundle args = new Bundle();
-        args.putString(ARG_QUERY, "");
-        mLoaderManager.restartLoader(0, args, this);
-        super.showDropDown();
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        // increase width to include add button
-        this.setDropDownWidth(this.getRight());
-    }
 }
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