aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/keyspinner_item.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-05 12:10:51 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-05 12:10:51 +0100
commit7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch)
tree861f5c7d329ea8c96e673b2c16f068d593a55fb9 /OpenKeychain/src/main/res/layout/keyspinner_item.xml
parent98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff)
parent8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff)
downloadopen-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz
open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2
open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip
Merge branch 'development' into linked-identities
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/keyspinner_item.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/keyspinner_item.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 757dae5be..45147e7b1 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/status_signature_revoked_cutout_24px"
+ android:src="@drawable/status_signature_revoked_cutout_24dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />