From 5a807ffc289103f2f13756329c5ebe2057e5f690 Mon Sep 17 00:00:00 2001
From: Veeti Paananen <veeti.paananen@rojekti.fi>
Date: Tue, 25 Feb 2014 05:12:30 +0200
Subject: [PATCH] Use unified touch highlight in import & export

---
 res/drawable/clickable_card.xml | 2 +-
 res/values-v19/colors.xml       | 1 -
 res/values/colors.xml           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/drawable/clickable_card.xml b/res/drawable/clickable_card.xml
index 55e1337bd..23b7c7f83 100644
--- a/res/drawable/clickable_card.xml
+++ b/res/drawable/clickable_card.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/card_background_active" />
+            <solid android:color="@color/touch_highlight" />
         </shape>
         <bitmap android:src="@drawable/card" />
     </item>
diff --git a/res/values-v19/colors.xml b/res/values-v19/colors.xml
index c9b0564e4..4d2b6f2d8 100644
--- a/res/values-v19/colors.xml
+++ b/res/values-v19/colors.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="touch_highlight">#10000000</color>
-    <color name="card_background_active">#99bebebe</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 130f374bd..38a561c38 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -12,7 +12,6 @@
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
     <color name="touch_highlight">#400099cc</color>
-    <color name="card_background_active">#9933b5e5</color>
 
     <color name="conversation_item_sent_background_dark">#ff284e0a</color>
     <color name="conversation_item_sent_background_light">#ff64a926</color>