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/key_list_item.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/key_list_item.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_item.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index db0462c6d..fbe5f1326 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.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="?android:attr/listPreferredItemHeight" @@ -69,7 +70,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout_24dp" - android:padding="16dp" /> + android:padding="16dp" + tools:src="@drawable/status_signature_revoked_cutout_24dp" + /> </LinearLayout> |