diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-30 15:53:44 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-30 15:53:44 +0200 |
commit | 91494dd3a339ce14c3c722c22da6ff5c3241630b (patch) | |
tree | f2f35be53c35d1cc4ddc58474a7a9426bf4e90aa /OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml | |
parent | 726ff0b501644e0cef6d5d4a086e73c258b2361c (diff) | |
parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
download | open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.tar.gz open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.tar.bz2 open-keychain-91494dd3a339ce14c3c722c22da6ff5c3241630b.zip |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml index 57ca9b9d8..a9e86057c 100644 --- a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dip" @@ -21,7 +22,8 @@ android:layout_height="wrap_content" android:paddingLeft="8dip" android:singleLine="true" - android:ellipsize="end" /> + android:ellipsize="end" + tools:text="Alice" /> <TextView android:id="@android:id/text1" @@ -32,7 +34,8 @@ android:paddingLeft="16dip" android:singleLine="true" android:ellipsize="end" - android:layout_marginTop="-4dip" /> + android:layout_marginTop="-4dip" + tools:text="alice@example.com" /> <TextView android:id="@android:id/text2" @@ -43,15 +46,18 @@ android:paddingLeft="16dip" android:singleLine="true" android:ellipsize="end" - android:layout_marginTop="-4dip" /> + android:layout_marginTop="-4dip" + tools:text="Creation 12.03.2015" /> + </LinearLayout> <ImageView - android:id="@android:id/icon" - android:layout_width="56dip" - android:layout_height="56dip" - android:layout_marginLeft="12dip" - android:cropToPadding="true" - android:background="#ccc" - android:scaleType="centerCrop" /> + android:id="@+id/status_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:padding="16dp" + tools:src="@drawable/status_signature_revoked_cutout_24dp" + /> + </LinearLayout>
\ No newline at end of file |