Merge pull request #479 from AlexanderS/subkey-expiry

Display expiry of subkeys in single key view.
This commit is contained in:
Dominik Schürmann
2014-03-26 00:20:17 +01:00
2 changed files with 31 additions and 1 deletions

View File

@@ -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>
</LinearLayout>