diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/layout/recipient_box_entry.xml | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/layout/recipient_box_entry.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/recipient_box_entry.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml new file mode 100644 index 000000000..a7862c515 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/attachment_bg_holo"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dip" + android:id="@android:id/text1" + android:layout_gravity="center_vertical"/> + + <ImageView + android:id="@android:id/icon" + android:layout_width="32dip" + android:layout_height="32dip" + android:layout_marginLeft="12dip" + android:cropToPadding="true" + android:background="#ccc" + android:scaleType="centerCrop"/> +</LinearLayout>
\ No newline at end of file |