From 0b091aa642f6b33f70628d112fa5d2b2afb23e2d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 7 Sep 2014 18:49:10 +0200
Subject: flag revoked, epired and unavailable keys in selection spinner

---
 .../src/main/res/layout/keyspinner_item.xml        | 44 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 346d09113..c519a92cc 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -26,14 +26,38 @@
         android:layout_marginTop="-4dip"
         android:text="alice@example.com" />
 
-    <TextView
-        android:id="@+id/keyspinner_key_id"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:typeface="monospace"
-        android:layout_marginTop="-4dip" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:padding="4dp"
+                  android:minHeight="24dp"
+                  android:layout_height="wrap_content"
+                  android:id="@+id/keyspinner_key_row">
+
+        <TextView
+            android:id="@+id/keyspinner_key_id"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:typeface="monospace"
+            android:layout_marginTop="-4dip"
+            android:layout_weight="1"/>
+
+        <TextView
+            android:id="@+id/keyspinner_key_status"
+            android:textColor="#e00"
+            android:textSize="12sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_gravity="right"
+            android:text="status"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3