aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-04-27 17:45:50 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-04-27 17:45:50 +0200
commit32db4e393b823759380ebdcdac28bfd950cd41e4 (patch)
tree785b9b6581836163d1a86f26bb8b81b0b9fcf08f /OpenKeychain/src/main/res
parent0ad66eb510772a5731fa97d1745082b43a71215e (diff)
downloadopen-keychain-32db4e393b823759380ebdcdac28bfd950cd41e4.tar.gz
open-keychain-32db4e393b823759380ebdcdac28bfd950cd41e4.tar.bz2
open-keychain-32db4e393b823759380ebdcdac28bfd950cd41e4.zip
display creation dates for ambiguous user ids
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_item.xml16
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 15 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index fbe5f1326..6078b898f 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -26,7 +26,7 @@
android:id="@+id/key_list_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/label_main_user_id"
+ tools:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@@ -35,8 +35,20 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
- android:text="user@example.com"
+ tools:text="user@example.com"
android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <TextView
+ android:id="@+id/key_list_item_creation"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:visibility="gone"
+ tools:visibility="visible"
+ tools:text="Created on 10/10/2010 10:00"
+ />
+
</LinearLayout>
<LinearLayout
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ea226834c..90389cdc1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -138,7 +138,7 @@
<string name="label_file_compression">"File compression"</string>
<string name="label_keyservers">"Keyservers"</string>
<string name="label_key_id">"Key ID"</string>
- <string name="label_creation">"Creation"</string>
+ <string name="label_creation">"Key created %s"</string>
<string name="label_expiry">"Expiry"</string>
<string name="label_usage">"Usage"</string>
<string name="label_key_size">"Key Size"</string>