Merge pull request #483 from uberspot/master

fix capability icons and remove red text for revoked keys

2 files changed, 18 insertions, 19 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index ed4113fb8..9d60c1530 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
@@ -131,10 +131,6 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
         if (cursor.getInt(mIndexRevokedKey) > 0) {
             revokedKeyIcon.setVisibility(View.VISIBLE);
 
-            keyId.setTextColor(Color.RED);
-            keyDetails.setTextColor(Color.RED);
-            keyExpiry.setTextColor(Color.RED);
-
             valid = false;
         } else {
             keyId.setTextColor(mDefaultTextColor);
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 13813f7e7..aecedc39b 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
@@ -14,21 +14,24 @@
         android:paddingRight="6dip"
         android:src="@drawable/key_small" />
 
-    <TextView
-        android:id="@+id/keyId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingRight="5dip"
-        android:text="@string/label_key_id"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:typeface="monospace" />
-
     <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="2dip"
             android:paddingTop="2dip" >
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+            <TextView
+                    android:id="@+id/keyId"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingRight="2dip"
+                    android:text="@string/label_key_id"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:typeface="monospace" />
 
             <TextView
                 android:id="@+id/keyDetails"
@@ -37,21 +40,21 @@
                 android:paddingRight="5dip"
                 android:text="(RSA, 1024bit)"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
-
+        </LinearLayout>
             <TextView
                 android:id="@+id/keyExpiry"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="right"
                 android:text="@string/label_expiry"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:gravity="right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="right"
         android:paddingBottom="2dip"
         android:paddingTop="2dip" >