From 767d790b3d62a60815310a9c3644b82f95979629 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 29 Jun 2013 10:33:58 -0700
Subject: [PATCH] Dark theme fixes.

1) Make the conversation background all black with no column.

2) Fix the font color on identity key review.
---
 res/layout/identity_key_view.xml | 3 +--
 res/values/themes.xml            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/layout/identity_key_view.xml b/res/layout/identity_key_view.xml
index 662f76b10..27485d94b 100644
--- a/res/layout/identity_key_view.xml
+++ b/res/layout/identity_key_view.xml
@@ -33,8 +33,7 @@
               android:layout_alignTop="@id/contact_photo_frame"
               android:layout_toRightOf="@id/contact_photo_frame"
               android:layout_alignWithParentIfMissing="true"
-              android:ellipsize="marquee"
-              android:textColor="#000000"/>
+              android:ellipsize="marquee"/>
 
     <TextView android:id="@+id/fingerprint"
               android:layout_width="wrap_content"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index ecea59645..9cfc9ec6b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -36,7 +36,7 @@
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
         <item name="conversation_list_item_count_color">#66dddddd</item>
 
-        <item name="conversation_card_background">#ffdddddd</item>
+        <item name="conversation_card_background">@color/black</item>
         <item name="conversation_background">@color/black</item>
         <item name="conversation_text_primary_color">@color/abs__primary_text_holo_dark</item>
         <item name="conversation_text_secondary_color">#ffcccccc</item>