aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-26 00:20:17 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-26 00:20:17 +0100
commitdbbb782911e598ff1a068f87ef3dbcc7e00d0ef9 (patch)
tree807583d90ad33bc67e3f0ca22c0e19d782cc1007 /OpenPGP-Keychain/src/main/res
parent028af0c1195b2d6a747874af8cae07dde542dc64 (diff)
parent4e481512c31c60177d3c1b404c97fa8d7a004124 (diff)
downloadopen-keychain-dbbb782911e598ff1a068f87ef3dbcc7e00d0ef9.tar.gz
open-keychain-dbbb782911e598ff1a068f87ef3dbcc7e00d0ef9.tar.bz2
open-keychain-dbbb782911e598ff1a068f87ef3dbcc7e00d0ef9.zip
Merge pull request #479 from AlexanderS/subkey-expiry
Display expiry of subkeys in single key view.
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
index 235949ce2..43f06e246 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml
@@ -28,9 +28,17 @@
android:id="@+id/keyDetails"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingRight="5dip"
android:text="(RSA, 1024bit)"
android:textAppearance="?android:attr/textAppearanceSmall" />
+ <TextView
+ android:id="@+id/keyExpiry"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/label_expiry"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -63,4 +71,4 @@
android:src="@drawable/signed_small" />
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>