PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Revert "Add + button besides TokenAutoComplete, Issue #925"

Browse source 
This reverts commit 72d2a627ff.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
This commit is contained in:
Dominik Schürmann 2016-05-12 14:53:16 +03:00
parent c59a32b6a7
commit f44bd23622
3 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
View file

@ -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;
}

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
View file

@ -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());
}
}

10
OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View file

@ -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>