aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-12 14:53:16 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-12 14:53:16 +0300
commitf44bd236224e782d85c9764a4b655ae922356b14 (patch)
treea595a2a21d043934a47a92b57ce1a7fc691880b5 /OpenKeychain/src/main/res
parentc59a32b6a715952b9364b9f8d8406edfc6f1f1e7 (diff)
downloadopen-keychain-f44bd236224e782d85c9764a4b655ae922356b14.tar.gz
open-keychain-f44bd236224e782d85c9764a4b655ae922356b14.tar.bz2
open-keychain-f44bd236224e782d85c9764a4b655ae922356b14.zip
Revert "Add + button besides TokenAutoComplete, Issue #925"
This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml10
1 files changed, 1 insertions, 9 deletions
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>